Skip to contentSkip to conversation

arm: socfpga: cyclone5-socdk: Enabling U-Boot environment in QSPI

PATCH Superseded Chin Liang See 2 participants 4 messages Dec 11, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 arm: socfpga: cyclone5-socdk: Enabling U-Boot environment in QSPI

Enabling the support of storing U-Boot environment within serial NOR flash. By default, its still store into SDMMC

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_cyclone5_socdk.h | 8 ++++++++
 1 file changed, 8 insertions(+)
include/configs/socfpga_cyclone5_socdk.h +8 -0
index e4a1657..fbab0bd 100644
@@ -58,9 +58,17 @@
 
 #endif
 
+/* U-Boot environment */
 #define CONFIG_ENV_IS_IN_MMC
+#undef CONFIG_ENV_IS_IN_SPI_FLASH
+
+#ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+#elif CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SECT_SIZE		(64 * 1024)
+#define CONFIG_ENV_OFFSET		0x400000
+#endif
 
 /* USB */
 #ifdef CONFIG_CMD_USB

--
1.9.2.468.g3f0c02a

#1 lore raw

PATCH 2/6 arm: socfpga: arria5-socdk: Enabling U-Boot environment in QSPI

Enabling the support of storing U-Boot environment within serial NOR flash. By default, its still store into SDMMC

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_arria5_socdk.h | 8 ++++++++
 1 file changed, 8 insertions(+)
include/configs/socfpga_arria5_socdk.h +8 -0
index d9f07d8..8bd23bd 100644
@@ -58,9 +58,17 @@
 
 #endif
 
+/* U-Boot environment */
 #define CONFIG_ENV_IS_IN_MMC
+#undef CONFIG_ENV_IS_IN_SPI_FLASH
+
+#ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+#elif CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SECT_SIZE		(64 * 1024)
+#define CONFIG_ENV_OFFSET		0x400000
+#endif
 
 /* USB */
 #ifdef CONFIG_CMD_USB

--
1.9.2.468.g3f0c02a

#2 lore raw

PATCH 2/6 arm: socfpga: arria5-socdk: Enabling U-Boot environment in QSPI

Quoted 19 lines · Chin Liang See

Enabling the support of storing U-Boot environment within serial NOR flash. By default, its still store into SDMMC

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_arria5_socdk.h | 8 ++++++++
 1 file changed, 8 insertions(+)
(quoted diff) +0 -0

b/include/configs/socfpga_arria5_socdk.h index d9f07d8..8bd23bd 100644

include/configs/socfpga_arria5_socdk.h line 63

Quoted 6 lines
include/configs/socfpga_arria5_socdk.h +2 -0
@@ -58,9 +58,17 @@
 
 #endif
 
+/* U-Boot environment */
 #define CONFIG_ENV_IS_IN_MMC
+#undef CONFIG_ENV_IS_IN_SPI_FLASH

DTTO

Best regards,
Marek Vasut

#3 lore raw

PATCH 1/6 arm: socfpga: cyclone5-socdk: Enabling U-Boot environment in QSPI

In reply to Chin Liang See
Quoted 19 lines · Chin Liang See

Enabling the support of storing U-Boot environment within serial NOR flash. By default, its still store into SDMMC

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_cyclone5_socdk.h | 8 ++++++++
 1 file changed, 8 insertions(+)
(quoted diff) +0 -0

b/include/configs/socfpga_cyclone5_socdk.h index e4a1657..fbab0bd 100644

include/configs/socfpga_cyclone5_socdk.h line 63

Quoted 6 lines
include/configs/socfpga_cyclone5_socdk.h +2 -0
@@ -58,9 +58,17 @@
 
 #endif
 
+/* U-Boot environment */
 #define CONFIG_ENV_IS_IN_MMC
+#undef CONFIG_ENV_IS_IN_SPI_FLASH

Drop the undef please , we don't want this to confuse Kconfig later.

Quoted 11 lines
include/configs/socfpga_cyclone5_socdk.h +5 -1
+#ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+#elif CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SECT_SIZE		(64 * 1024)
+#define CONFIG_ENV_OFFSET		0x400000
+#endif
 
 /* USB */
 #ifdef CONFIG_CMD_USB
--
Quoted 1 line

1.9.2.468.g3f0c02a

Best regards,
Marek Vasut