| Message ID | 1456510833-9664-1-git-send-email-marex@denx.de |
|---|---|
| State | Accepted |
| Commit | b72041ccf8d26a1c530f69418a385f03e0b71984 |
| Delegated to: | Marek Vasut |
| Headers | show |
On 26.02.2016 19:20, Marek Vasut wrote: > 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> Acked-by: Stefan Roese <sr@denx.de> Thanks, Stefan
On 02/27/2016 10:25 AM, Stefan Roese wrote: > On 26.02.2016 19:20, Marek Vasut wrote: >> 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> > > Acked-by: Stefan Roese <sr@denx.de> In that case, applied and pushed. Thanks!
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index fdf67ca..e4aafaa 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__ */
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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)