Save environment data to mmc.
Subsystems (2)
PATCH v6 1/1 Save environment data to mmc.
This patch is to save environment data to mmc card. It uses interfaces defined in generic mmc.
v6 version fixes the coding-style problems.
Signed-off-by Terry Lv <[email protected]>
--- arch/arm/lib/board.c | 15 +++-- arch/powerpc/lib/board.c | 17 +++-- common/Makefile | 1 + common/cmd_nvedit.c | 3 +- common/env_mmc.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 178 insertions(+), 12 deletions(-) create mode 100644 common/env_mmc.c
arch/arm/lib/board.c +10 -5
@@ -347,6 +347,16 @@ void start_armboot (void)dataflash_print_info ();#endif +#ifdef CONFIG_GENERIC_MMC +/* +* MMC initialization is called before relocating env. +* Thus It is required that operations like pin multiplexer +* be put in board_init. +*/ +puts ("MMC: " ); +mmc_initialize (gd->bd); +#endif +/* initialize environment */ env_relocate ();
@@ -419,11 +429,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 +11 -6
@@ -783,6 +783,17 @@ void board_init_r (gd_t *id, ulong dest_addr)nand_init ();/* go init the NAND */ #endif +#ifdef CONFIG_GENERIC_MMC +/* +* MMC initialization is called before relocating env. +* Thus It is required that operations like pin multiplexer +* be put in board_init. +*/ +WATCHDOG_RESET (); +puts ("MMC: " ); +mmc_initialize (bd); +#endif +/* relocate environment function pointers etc. */ env_relocate ();
@@ -939,12 +950,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
@@ -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 +2 -1
@@ -59,13 +59,14 @@ 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 ) && \ !defined (CONFIG_ENV_IS_IN_SPI_FLASH ) && \ !defined(CONFIG_ENV_IS_NOWHERE)# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ -SPI_FLASH|MG_DISK|NVRAM|NOWHERE} +SPI_FLASH|MG_DISK|NVRAM|MMC|NOWHERE}#endif #define XMK_STR (x) #x
common/env_mmc.c new file +154 -0
154 lines not on this page · raw message
Signature · 1 line
1.6.0.4
Wolfgang Denk
AppliedPATCH v6 1/1 Save environment data to mmc.
Dear Terry Lv,
Quoted 6 lines · In message <[email protected]> you wrote:
This patch is to save environment data to mmc card. It uses interfaces defined in generic mmc.
v6 version fixes the coding-style problems.
Signed-off-by Terry Lv <[email protected]>
Quoted 8 lines
--- arch/arm/lib/board.c | 15 +++-- arch/powerpc/lib/board.c | 17 +++-- common/Makefile | 1 + common/cmd_nvedit.c | 3 +- common/env_mmc.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 178 insertions(+), 12 deletions(-) create mode 100644 common/env_mmc.c
Applied, thanks.
Best regards,
Wolfgang Denk
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-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de You can love it, change it, or leave it. There is NO other option. But do not complain - it is your own choice... -- wd