diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-20 18:09:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-20 18:09:34 -0400 |
| commit | 83d95b67d3731e39292d858924ade3be68c167af (patch) | |
| tree | 8f7ca00720b53d66bb879068f73f54ed402f3bb9 /include/configs/socfpga_common.h | |
| parent | 1b108880e6433e398681785f51b2a2dca983cd1b (diff) | |
| parent | 93d9fc26cb7b4fcbb849e79d21d16b114e4501a9 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'include/configs/socfpga_common.h')
| -rw-r--r-- | include/configs/socfpga_common.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index cd48c9e1ca..56d32e6b53 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -284,7 +284,9 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE +#if !defined(CONFIG_ENV_SIZE) #define CONFIG_ENV_SIZE 4096 +#endif /* Environment for SDMMC boot */ #if defined(CONFIG_ENV_IS_IN_MMC) && !defined(CONFIG_ENV_OFFSET) @@ -292,6 +294,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_ENV_OFFSET 512 /* just after the MBR */ #endif +/* Environment for QSPI boot */ +#if defined(CONFIG_ENV_IS_IN_SPI_FLASH) && !defined(CONFIG_ENV_OFFSET) +#define CONFIG_ENV_OFFSET 0x00100000 +#define CONFIG_ENV_SECT_SIZE (64 * 1024) +#endif + /* * mtd partitioning for serial NOR flash * |