Save environment data to mmc.

PATCH New Terry Lv 2 participants 4 messages Apr 29, 2010 – Apr 30, 2010

Subsystems (2)

Arm (32-bit) PowerPC

lore

Share & tools

lore

Terry Lv

author

2010-04-29 07:40 UTC #0 lore raw

PATCH 1/1 Save environment data to mmc.

This patch is to save environment data to mmc card. It uses interfaces defined in generic mmc.

Signed-off-by Terry Lv <[email protected]>

---
 arch/arm/lib/board.c     |   10 ++--
 arch/powerpc/lib/board.c |   12 ++--
 common/Makefile          |    1 +
 common/cmd_nvedit.c      |    1 +
 common/env_mmc.c         |  154 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 167 insertions(+), 11 deletions(-)
 create mode 100644 common/env_mmc.c

arch/arm/lib/board.c +5 -5

index f5660a9..f62e0eb 100644
@@ -347,6 +347,11 @@ void start_armboot (void)
 	dataflash_print_info();
 #endif
 
+#ifdef CONFIG_GENERIC_MMC
+	puts ("MMC:   ");
+	mmc_initialize (gd->bd);
+#endif
+
 	/* initialize environment */
 	env_relocate ();

@@ -419,11 +424,6 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr);
 	board_late_init ();
 #endif
 
-#ifdef CONFIG_GENERIC_MMC
-	puts ("MMC:   ");
-	mmc_initialize (gd->bd);
-#endif
-
 #ifdef CONFIG_BITBANGMII
 	bb_miiphy_init();
 #endif

arch/powerpc/lib/board.c +6 -6

index 7b09fb5..1008635 100644
@@ -783,6 +783,12 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	nand_init();		/* go init the NAND */
 #endif
 
+#ifdef CONFIG_GENERIC_MMC
+	WATCHDOG_RESET ();
+	puts ("MMC:  ");
+	mmc_initialize (bd);
+#endif
+
 	/* relocate environment function pointers etc. */
 	env_relocate ();

@@ -939,12 +945,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	scsi_init ();
 #endif
 
-#ifdef CONFIG_GENERIC_MMC
-	WATCHDOG_RESET ();
-	puts ("MMC:  ");
-	mmc_initialize (bd);
-#endif
-
 #if defined(CONFIG_CMD_DOC)
 	WATCHDOG_RESET ();
 	puts ("DOC:   ");

common/Makefile +1 -0

index dbf7a05..2c37073 100644
@@ -58,6 +58,7 @@ COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o
 COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
 COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o
+COBJS-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
 COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o

common/cmd_nvedit.c +1 -0

index eb89e9e..78f75fb 100644
@@ -59,6 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_FLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_MG_DISK)	&& \
+    !defined(CONFIG_ENV_IS_IN_MMC)  && \
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CONFIG_ENV_IS_IN_NVRAM)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \

common/env_mmc.c new file +154 -0

154 lines not on this page · raw message

Signature · 1 line

1.6.0.4

Stefano Babic

2010-04-29 14:33 UTC #1 lore raw

PATCH 1/1 Save environment data to mmc.

Quoted 2 lines · Terry Lv

This patch is to save environment data to mmc card. It uses interfaces defined in generic mmc.

Hi Terry,

Quoted 10 lines

Signed-off-by Terry Lv <[email protected]>

---
 arch/arm/lib/board.c     |   10 ++--
 arch/powerpc/lib/board.c |   12 ++--
 common/Makefile          |    1 +
 common/cmd_nvedit.c      |    1 +
 common/env_mmc.c         |  154 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 167 insertions(+), 11 deletions(-)
 create mode 100644 common/env_mmc.c

Could you set a version of your patch (something like [PATCH V*] in the subject, so it is easier to track changes ? This is the third version, but it is difficult to get it without searching in archive.

Quoted 19 lines

arch/arm/lib/board.c +5 -0

index f5660a9..f62e0eb 100644
@@ -347,6 +347,11 @@ void start_armboot (void)
 	dataflash_print_info();
 #endif
 
+#ifdef CONFIG_GENERIC_MMC
+	puts ("MMC:   ");
+	mmc_initialize (gd->bd);
+#endif
+
 	/* initialize environment */
 	env_relocate ();

@@ -419,11 +424,6 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr);
 	board_late_init ();

arch/arm/lib/board.c extern void davinci_eth_set_mac_addr (const u_int8_t *addr); · line 429

Quoted 10 lines

arch/arm/lib/board.c +0 -5

 #endif
 
-#ifdef CONFIG_GENERIC_MMC
-	puts ("MMC:   ");
-	mmc_initialize (gd->bd);
-#endif
-
 #ifdef CONFIG_BITBANGMII
 	bb_miiphy_init();
 #endif

Because it is required to move the initialization of the mmc before env_relocate(), we need probably to advise that there are some consequences. If someone implements the mmc support in board_late_init() (setting a pin multiplexer or something like that, for example), it does not work. I think we should at least write a comment to advise that the mmc/sd controller should work after board_init() is called. However, after a quick check in the arm boards, I have not found a board that is initializing the mmc controller in board_late_init(). Not sure for powerpc.

Quoted 12 lines

common/cmd_nvedit.c +1 -0

index eb89e9e..78f75fb 100644
@@ -59,6 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_FLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_MG_DISK)	&& \
+    !defined(CONFIG_ENV_IS_IN_MMC)  && \
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CONFIG_ENV_IS_IN_NVRAM)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \

Lv Terry-R65388

author

2010-04-30 03:47 UTC #2 lore raw

PATCH 1/1 Save environment data to mmc.

Hi Babic,

Pls check my comments with keyword [Ty].

Thanks for reviewing the patch.

Thanks~~

Yours
Terry

-----Original Message-----
From: Stefano Babic [mailto:sbabic at denx.de]
Sent: 2010?4?29? 22:34
To: Lv Terry-R65388
Cc: u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH] Save environment data to mmc.

Quoted 2 lines · Terry Lv

This patch is to save environment data to mmc card. It uses interfaces defined in generic mmc.

Hi Terry,

Quoted 10 lines

Signed-off-by Terry Lv <[email protected]>

---
 arch/arm/lib/board.c     |   10 ++--
 arch/powerpc/lib/board.c |   12 ++--
 common/Makefile          |    1 +
 common/cmd_nvedit.c      |    1 +
 common/env_mmc.c         |  154 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 167 insertions(+), 11 deletions(-)  create mode

100644 common/env_mmc.c

Quoted 19 lines

arch/arm/lib/board.c index renamed from arch/arm/lib/board.c +0 -0

f5660a9..f62e0eb 100644

arch/arm/lib/board.c +5 -0

@@ -347,6 +347,11 @@ void start_armboot (void)
 	dataflash_print_info();
 #endif
 
+#ifdef CONFIG_GENERIC_MMC
+	puts ("MMC:   ");
+	mmc_initialize (gd->bd);
+#endif
+
 	/* initialize environment */
 	env_relocate ();

@@ -419,11 +424,6 @@ extern void davinci_eth_set_mac_addr (const u_int8_t *addr);
 	board_late_init ();

arch/arm/lib/board.c extern void davinci_eth_set_mac_addr (const u_int8_t *addr); · line 429

Quoted 10 lines

arch/arm/lib/board.c +0 -5

 #endif
 
-#ifdef CONFIG_GENERIC_MMC
-	puts ("MMC:   ");
-	mmc_initialize (gd->bd);
-#endif
-
 #ifdef CONFIG_BITBANGMII
 	bb_miiphy_init();
 #endif

Quoted 12 lines

common/cmd_nvedit.c index renamed from common/cmd_nvedit.c +0 -0

eb89e9e..78f75fb 100644

common/cmd_nvedit.c +1 -0

@@ -59,6 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_FLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_MG_DISK)	&& \
+    !defined(CONFIG_ENV_IS_IN_MMC)  && \
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CONFIG_ENV_IS_IN_NVRAM)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \

Stefano Babic

2010-04-30 13:14 UTC #3 lore raw

PATCH 1/1 Save environment data to mmc.

Hi Terry,

Quoted 2 lines

[Ty]: env_ptr is defined in env_mmc.c and the value is assigned in env_common.c. Correct me if I'm wrong.

No, you are right - env_relocate() called malloc and initialize the pointer.

Best regards,
Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================