diff options
| author | Marek Vasut <marex@denx.de> | 2016-02-26 19:11:30 +0100 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2016-03-20 18:01:10 +0100 |
| commit | b72041ccf8d26a1c530f69418a385f03e0b71984 (patch) | |
| tree | adda93b3e411f31148cae938c760169fd47070c4 /include/configs/socfpga_sr1500.h | |
| parent | ec8b75281b6205b945de75ae6a360e7254ab8677 (diff) | |
| download | u-boot-b72041ccf8d26a1c530f69418a385f03e0b71984.tar.gz | |
arm: socfpga: Fix SR1500 env position
Move the inclusion of the common socfpga configuration file further
down in the sr1500 configuration, so that the socfpga_common.h can
check if environment is in SPI NOR and it's location is defined and
if it is not, define default location.
This fixes "arm: socfpga: Enabling U-Boot environment support in QSPI"
which introduced a minor warning.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/socfpga_sr1500.h')
| -rw-r--r-- | include/configs/socfpga_sr1500.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index fdf67ca098..e4aafaafc3 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -92,13 +92,6 @@ #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfffffff8 #define CONFIG_SYS_BOOTCOUNT_BE -/* The rest of the configuration is shared */ -#include <configs/socfpga_common.h> - -/* U-Boot payload is stored at offset 0x60000 */ -#undef CONFIG_SYS_SPI_U_BOOT_OFFS -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x60000 - /* Environment setting for SPI flash */ #undef CONFIG_ENV_SIZE #define CONFIG_SYS_REDUNDAND_ENVIRONMENT @@ -111,4 +104,11 @@ #define CONFIG_ENV_SPI_MODE SPI_MODE_3 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED +/* The rest of the configuration is shared */ +#include <configs/socfpga_common.h> + +/* U-Boot payload is stored at offset 0x60000 */ +#undef CONFIG_SYS_SPI_U_BOOT_OFFS +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x60000 + #endif /* __CONFIG_SOCFPGA_SR1500_H__ */ |