]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: socfpga: Fix SR1500 env position
authorMarek Vasut <marex@denx.de>
Fri, 26 Feb 2016 18:11:30 +0000 (19:11 +0100)
committerMarek Vasut <marex@denx.de>
Sun, 20 Mar 2016 17:01:10 +0000 (18:01 +0100)
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>
include/configs/socfpga_sr1500.h

index fdf67ca09896867ccc46f80a5096c5cf7c73b7c7..e4aafaafc312a6f7974a3b00f5bc95710aca82c2 100644 (file)
 #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
 #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__ */