* [U-Boot] [PATCH] arm: socfpga: Fix SR1500 env position
@ 2016-02-26 18:20 Marek Vasut
2016-02-27 9:25 ` Stefan Roese
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2016-02-26 18:20 UTC (permalink / raw)
To: u-boot
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(-)
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__ */
--
2.7.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] arm: socfpga: Fix SR1500 env position
2016-02-26 18:20 [U-Boot] [PATCH] arm: socfpga: Fix SR1500 env position Marek Vasut
@ 2016-02-27 9:25 ` Stefan Roese
2016-02-27 14:31 ` Marek Vasut
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Roese @ 2016-02-27 9:25 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] arm: socfpga: Fix SR1500 env position
2016-02-27 9:25 ` Stefan Roese
@ 2016-02-27 14:31 ` Marek Vasut
0 siblings, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2016-02-27 14:31 UTC (permalink / raw)
To: u-boot
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!
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-27 14:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-26 18:20 [U-Boot] [PATCH] arm: socfpga: Fix SR1500 env position Marek Vasut
2016-02-27 9:25 ` Stefan Roese
2016-02-27 14:31 ` Marek Vasut
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.