Skip to contentSkip to conversation

arm: socfpga: Fix SR1500 env position

PATCH New Marek Vasut 2 participants 3 messages Feb 26, 2016 – Feb 27, 2016

lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
---
 include/configs/socfpga_sr1500.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
include/configs/socfpga_sr1500.h +7 -7
index fdf67ca..e4aafaa 100644
@@ -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__ */
Signature · 1 line
2.7.0
#1 lore raw

PATCH 1/1 arm: socfpga: Fix SR1500 env position

Quoted 8 lines · Marek Vasut

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.

Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Acked-by Stefan Roese <[email protected]>

Thanks,
Stefan

author
#2 lore raw

PATCH 1/1 arm: socfpga: Fix SR1500 env position

Quoted 17 lines · Stefan Roese
Quoted 8 lines · Marek Vasut

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.

Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
Quoted 1 line
Acked-by Stefan Roese <[email protected]>

In that case, applied and pushed. Thanks!

Signature · 2 lines
Best regards,
Marek Vasut