arm: socfpga: Consolidate SDMMC environment

PATCH New Chin Liang See 2 participants 8 messages Dec 21, 2015

Share & tools

Chin Liang See

author

2015-12-21 13:02 UTC #0 lore raw

PATCH 1/7 arm: socfpga: Consolidate SDMMC environment

Remove the duplication of SDMMC environment configuration from each boards' configuration header file into socfpga_common.h

Signed-off-by Chin Liang See <[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_common.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

include/configs/socfpga_common.h +6 -0

index 3a4df63..699e78a 100644
@@ -271,6 +271,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 #define CONFIG_ENV_SIZE			4096
 
+/* Environment for SDMMC boot */
+#if defined(CONFIG_ENV_IS_IN_MMC) && !defined(CONFIG_ENV_OFFSET)
+#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
+#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
+#endif
+
 /*
  * SPL
  *

Signature · 1 line

1.7.7.4

Chin Liang See

author

2015-12-21 13:02 UTC #1 lore raw

PATCH 2/7 arm: socfpga: cyclone5_socdk: Consolidate SDMMC environment

Remove the duplication of SDMMC environment configuration from each boards' configuration header file into socfpga_common.h

Signed-off-by Chin Liang See <[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 |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

include/configs/socfpga_cyclone5_socdk.h +0 -2

index d2efdda..3c2e2ae 100644
@@ -52,8 +52,6 @@
 #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 */
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

Signature · 1 line

1.7.7.4

Chin Liang See

author

2015-12-21 13:02 UTC #2 lore raw

PATCH 3/7 arm: socfpga: arria5_socdk: Consolidate SDMMC environment

In reply to Chin Liang See

Remove the duplication of SDMMC environment configuration from each boards' configuration header file into socfpga_common.h

Signed-off-by Chin Liang See <[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 |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

include/configs/socfpga_arria5_socdk.h +0 -2

index 3d5665d..af0f87f 100644
@@ -52,8 +52,6 @@
 #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 */
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

Signature · 1 line

1.7.7.4

Chin Liang See

author

2015-12-21 13:02 UTC #3 lore raw

PATCH 4/7 arm: socfpga: de0_nano_soc: Consolidate SDMMC environment

In reply to Chin Liang See

Remove the duplication of SDMMC environment configuration from each boards' configuration header file into socfpga_common.h

Signed-off-by Chin Liang See <[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_de0_nano_soc.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

include/configs/socfpga_de0_nano_soc.h +0 -2

index 959e3af..cbc7396 100644
@@ -48,8 +48,6 @@
 #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 */
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

Signature · 1 line

1.7.7.4

Chin Liang See

author

2015-12-21 13:02 UTC #4 lore raw

PATCH 5/7 arm: socfpga: mcvevk: Consolidate SDMMC environment

In reply to Chin Liang See

Remove the duplication of SDMMC environment configuration from each boards' configuration header file into socfpga_common.h

Signed-off-by Chin Liang See <[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_mcvevk.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

include/configs/socfpga_mcvevk.h +0 -2

index cd63faf..e7b5675 100644
@@ -45,8 +45,6 @@
 /* Environment is in MMC */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
-#define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS					\

Signature · 1 line

1.7.7.4

Chin Liang See

author

2015-12-21 13:02 UTC #5 lore raw

PATCH 6/7 arm: socfpga: sockit: Consolidate SDMMC environment

In reply to Chin Liang See

Remove the duplication of SDMMC environment configuration from each boards' configuration header file into socfpga_common.h

Signed-off-by Chin Liang See <[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_sockit.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

include/configs/socfpga_sockit.h +0 -2

index 6cbe367..2356c74 100644
@@ -48,8 +48,6 @@
 #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 */
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

Signature · 1 line

1.7.7.4

Chin Liang See

author

2015-12-21 13:02 UTC #6 lore raw

PATCH 7/7 arm: socfpga: socrates: Consolidate SDMMC environment

In reply to Chin Liang See

Remove the duplication of SDMMC environment configuration from each boards' configuration header file into socfpga_common.h

Signed-off-by Chin Liang See <[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_socrates.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

include/configs/socfpga_socrates.h +0 -2

index 1d88f4f..c32a40a 100644
@@ -48,8 +48,6 @@
 #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 */
 
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

Signature · 1 line

1.7.7.4

Marek Vasut

2015-12-21 14:26 UTC #7 lore raw

PATCH 1/7 arm: socfpga: Consolidate SDMMC environment

In reply to Chin Liang See

Quoted 10 lines · Chin Liang See

Remove the duplication of SDMMC environment configuration from each boards' configuration header file into socfpga_common.h
Signed-off-by 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]>

Applied all 7 to u-boot-socfpga/02-next, thanks.

Best regards,
Marek Vasut