Skip to contentSkip to conversation

arm: socfpga: Enable saveenv for SD/MMC

PATCH Superseded dinguyen at opensource.altera.com 3 participants 4 messages Sep 23, 2015 – Sep 24, 2015

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 arm: socfpga: Enable saveenv for SD/MMC

From: Dinh Nguyen <[email protected]>

Enable the able to save the environment variables when SD/MMC is used.

---
v3: Only define ENV_IS_NOWHERE if env is not in MMC, NAND, FAT, and SPI_FLASH
v2: Move this option to be on a per-board basis
Add config for socfpga_cyclone5 and socfpga_arria5

---
 include/configs/socfpga_arria5_socdk.h   | 4 ++++
 include/configs/socfpga_common.h         | 5 +++++
 include/configs/socfpga_cyclone5_socdk.h | 4 ++++
 include/configs/socfpga_de0_nano_soc.h   | 4 ++++
 include/configs/socfpga_sockit.h         | 4 ++++
 5 files changed, 21 insertions(+)
include/configs/socfpga_arria5_socdk.h +4 -0
index 3193684..b75b0a2 100644
@@ -59,6 +59,10 @@
 
 #endif
 
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
+#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2_REG_ADDR	SOCFPGA_USB1_ADDRESS
include/configs/socfpga_common.h +5 -0
index a2811ba..b3fba5b 100644
@@ -281,7 +281,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
+#if !defined CONFIG_ENV_IS_IN_MMC && \
+    !defined CONFIG_ENV_IS_IN_NAND && \
+    !defined CONFIG_ENV_IS_IN_FAT && \
+    !defined CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_NOWHERE
+#endif
 #define CONFIG_ENV_SIZE			4096
 
 /*
include/configs/socfpga_cyclone5_socdk.h +4 -0
index 9e733e5..fa67b25 100644
@@ -59,6 +59,10 @@
 
 #endif
 
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
+#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2_REG_ADDR	SOCFPGA_USB1_ADDRESS
include/configs/socfpga_de0_nano_soc.h +4 -0
index 2508d03..191e1f7 100644
@@ -55,6 +55,10 @@
 
 #endif
 
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
+#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2_REG_ADDR	SOCFPGA_USB1_ADDRESS
include/configs/socfpga_sockit.h +4 -0
index 747e988..6c71ef4 100644
@@ -59,6 +59,10 @@
 
 #endif
 
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
+#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2_REG_ADDR	SOCFPGA_USB1_ADDRESS
Signature · 1 line
2.4.5
#1 lore raw

PATCH v3 1/1 arm: socfpga: Enable saveenv for SD/MMC

Quoted 10 lines · dinguyen at opensource.altera.com

From: Dinh Nguyen <[email protected]>

Enable the able to save the environment variables when SD/MMC is used.

---
v3: Only define ENV_IS_NOWHERE if env is not in MMC, NAND, FAT, and SPI_FLASH v2: Move this option to be on a per-board basis
Add config for socfpga_cyclone5 and socfpga_arria5
---

[...]

Hi!

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 287

Quoted 10 lines
include/configs/socfpga_common.h +4 -0
@@ -281,7 +281,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
+#if !defined CONFIG_ENV_IS_IN_MMC && \
+    !defined CONFIG_ENV_IS_IN_NAND && \
+    !defined CONFIG_ENV_IS_IN_FAT && \
+    !defined CONFIG_ENV_IS_IN_SPI_FLASH

This really doesn't scale, I can have env in UBI for example, or on EEPROM and this condition would trigger and cause a problem. Just move the CONFIG_ENV_IS_NOWHERE into the respective board files and be done with it. This bit of duplication is pretty OK I'd say.

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 292

Quoted 5 lines
include/configs/socfpga_common.h +1 -0
 #define CONFIG_ENV_IS_NOWHERE
+#endif
 #define CONFIG_ENV_SIZE			4096
 
 /*

[...]

Sorry to pester you this way, the rest is great of course :)

Best regards,
Marek Vasut

#2 lore raw

PATCH v3 1/1 arm: socfpga: Enable saveenv for SD/MMC

In reply to dinguyen at opensource.altera.com

Hi!

Quoted 38 lines

From: Dinh Nguyen <[email protected]>

Enable the able to save the environment variables when SD/MMC is used.

---
v3: Only define ENV_IS_NOWHERE if env is not in MMC, NAND, FAT, and SPI_FLASH
v2: Move this option to be on a per-board basis
Add config for socfpga_cyclone5 and socfpga_arria5

---
 include/configs/socfpga_arria5_socdk.h   | 4 ++++
 include/configs/socfpga_common.h         | 5 +++++
 include/configs/socfpga_cyclone5_socdk.h | 4 ++++
 include/configs/socfpga_de0_nano_soc.h   | 4 ++++
 include/configs/socfpga_sockit.h         | 4 ++++
 5 files changed, 21 insertions(+)
include/configs/socfpga_arria5_socdk.h +4 -0
index 3193684..b75b0a2 100644
@@ -59,6 +59,10 @@
 
 #endif
 
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
+#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+
 /* USB */
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2_REG_ADDR	SOCFPGA_USB1_ADDRESS
include/configs/socfpga_common.h +0 -0
index a2811ba..b3fba5b 100644
@@ -281,7 +281,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 291

Quoted 10 lines
include/configs/socfpga_common.h +5 -0
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
+#if !defined CONFIG_ENV_IS_IN_MMC && \
+    !defined CONFIG_ENV_IS_IN_NAND && \
+    !defined CONFIG_ENV_IS_IN_FAT && \
+    !defined CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_NOWHERE
+#endif
 #define CONFIG_ENV_SIZE			4096
 

Actually... if we decided that position of u-boot environment is board-specific, size should be board-specific, too.

But it might be better to just define

#define ENV_IN_MMC_SECTOR_1

in each board, and have the common code in socfpga_common.h... so that we can change environment size for all boards using "after mmc" layout, for example.

Ouch and 4K is way too small.
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#3 lore raw

PATCH v3 1/1 arm: socfpga: Enable saveenv for SD/MMC

Quoted 65 lines · Pavel Machek

Hi!

Quoted 47 lines

From: Dinh Nguyen <[email protected]>

Enable the able to save the environment variables when SD/MMC is used.

---
v3: Only define ENV_IS_NOWHERE if env is not in MMC, NAND, FAT, and SPI_FLASH v2: Move this option to be on a per-board basis

Add config for socfpga_cyclone5 and socfpga_arria5

---

 include/configs/socfpga_arria5_socdk.h   | 4 ++++
 include/configs/socfpga_common.h         | 5 +++++
 include/configs/socfpga_cyclone5_socdk.h | 4 ++++
 include/configs/socfpga_de0_nano_soc.h   | 4 ++++
 include/configs/socfpga_sockit.h         | 4 ++++
 5 files changed, 21 insertions(+)
(quoted diff) +0 -0

b/include/configs/socfpga_arria5_socdk.h index 3193684..b75b0a2 100644

include/configs/socfpga_arria5_socdk.h +4 -0
@@ -59,6 +59,10 @@
 
 #endif
 
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
+#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+
 
 /* USB */
 #ifdef CONFIG_CMD_USB

#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS

(quoted diff) +0 -0

b/include/configs/socfpga_common.h index a2811ba..b3fba5b 100644

include/configs/socfpga_common.h +0 -0
@@ -281,7 +281,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void);

Quoted 10 lines
include/configs/socfpga_common.h +5 -0
+#if !defined CONFIG_ENV_IS_IN_MMC && \
+    !defined CONFIG_ENV_IS_IN_NAND && \
+    !defined CONFIG_ENV_IS_IN_FAT && \
+    !defined CONFIG_ENV_IS_IN_SPI_FLASH
 
 #define CONFIG_ENV_IS_NOWHERE
 
+#endif
 
 #define CONFIG_ENV_SIZE			4096

Actually... if we decided that position of u-boot environment is board-specific, size should be board-specific, too.

But it might be better to just define

Quoted 7 lines

#define ENV_IN_MMC_SECTOR_1

in each board, and have the common code in socfpga_common.h... so that we can change environment size for all boards using "after mmc" layout, for example.

Ouch and 4K is way too small.

Patch is welcome :-)