Skip to contentSkip to conversation

Save environment data to mmc.

PATCH New Terry Lv 2 participants 2 messages Apr 28, 2010

Subsystems (2)
lore
Share & tools
lore

Terry Lv

author
#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.

---
 arch/arm/lib/board.c     |   10 ++--
 arch/powerpc/lib/board.c |   12 ++--
 common/Makefile          |    1 +
 common/cmd_nvedit.c      |    1 +
 common/env_mmc.c         |  160 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 173 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 +160 -0

160 lines not on this page · raw message

Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 1/1 Save environment data to mmc.

Quoted 12 lines · Terry Lv

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

common/env_mmc.c new file +0 -0
new file mode 100644
index 0000000..202370e

common/env_mmc.c line 8

Quoted 8 lines
common/env_mmc.c new file +8 -0
@@ -0,0 +1,160 @@
+/*
+ * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
+
+ * (C) Copyright 2000-2006
+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+ *
+ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
+ * Andreas Heppel <[email protected]>

Are these non-Freescale copyrights here for a reason, or were they just copied from somewhere?

common/env_mmc.c line 49

Quoted 6 lines
common/env_mmc.c new file +6 -0
+#ifdef ENV_IS_EMBEDDED
+extern uchar environment[];
+env_t *env_ptr = (env_t *)(&environment[0]);
+#else /* ! ENV_IS_EMBEDDED */
+env_t *env_ptr;
+#endif /* ENV_IS_EMBEDDED */

You should probably initialize env_ptr to NULL, here.

common/env_mmc.c

Quoted 5 lines
common/env_mmc.c new file +5 -0
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define BLOCK_ALIGN(x) ((x & (0x200 - 1)) \
+ ? ? ? ? ? ? ? ? ? ? ? ?? ((x >> 9) + 1) : (x >> 9))

No need to reinvent the wheel, here. This is the same as:

ALIGN(x, 0x200);

See: include/common.h

Also, are you sure the block size is 0x200? That's a very common block size, but the MMC spec allows a whole bunch of alternate ones. You should use the actual value of mmc->read_bl_len and mmc->write_bl_len;

common/env_mmc.c line 75

Quoted 10 lines
common/env_mmc.c new file +10 -0
+int env_init(void)
+{
+ ? ? ? /* use default */
+ ? ? ? gd->env_addr = (ulong)&default_environment[0];
+ ? ? ? gd->env_valid = 1;
+
+ ? ? ? return 0;
+}
+
+inline int init_mmc_for_env(struct mmc *mmc)

Why is this inlined? Don't inline a function if there's no good reason.

Quoted 8 lines
common/env_mmc.c new file +8 -0
+{
+ ? ? ? if (!mmc) {
+ ? ? ? ? ? ? ? puts("No MMC card found\n");
+ ? ? ? ? ? ? ? return -1;
+ ? ? ? }
+
+ ? ? ? if (mmc_init(mmc)) {
+ ? ? ? ? ? ? ? puts("MMC init failed\n");

common/env_mmc.c

Quoted 10 lines
common/env_mmc.c new file +9 -0
+ ? ? ? ? ? ? ? return ?-1;
+ ? ? ? }
+
+ ? ? ? return 0;
+}
 
+inline int write_env(struct mmc *mmc, unsigned long size,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned long offset, const void *buffer)
+{
+ ? ? ? uint blk_start = 0, blk_cnt = 0, n = 0;

Don't initialize variables to zero right before assigning them.

Quoted 8 lines
common/env_mmc.c new file +8 -0
+
+ ? ? ? blk_start = BLOCK_ALIGN(offset);
+ ? ? ? blk_cnt ? = BLOCK_ALIGN(size);
+
+ ? ? ? n = mmc->block_dev.block_write(CONFIG_SYS_MMC_ENV_DEV, blk_start , blk_cnt, (u_char *)buffer);
+
+ ? ? ? return (n == blk_cnt) ? 0 : -1;
+}

common/env_mmc.c

Quoted 10 lines
common/env_mmc.c new file +10 -0
+
+int saveenv(void)
+{
+ ? ? ? struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+
+ ? ? ? if (init_mmc_for_env(mmc))
+ ? ? ? ? ? ? ? return 1;
+
+ ? ? ? printf("Writing to MMC(%d)... ", CONFIG_SYS_MMC_ENV_DEV);
+ ? ? ? if (write_env(mmc, CONFIG_ENV_SIZE, \

You don't need that "\". C does that for you automatically.

common/env_mmc.c

Quoted 4 lines
common/env_mmc.c new file +4 -0
+inline int read_env(struct mmc *mmc, unsigned long size,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned long offset, const void *buffer)
+{
+ ? ? ? uint blk_start = 0, blk_cnt = 0, n = 0;

Again, don't bother zeroing out values like this.

Quoted 9 lines
common/env_mmc.c new file +9 -0
+
+ ? ? ? blk_start = BLOCK_ALIGN(offset);
+ ? ? ? blk_cnt ? = BLOCK_ALIGN(size);
+
+ ? ? ? n = mmc->block_dev.block_read(CONFIG_SYS_MMC_ENV_DEV, blk_start, blk_cnt, (uchar *)buffer);
+
+ ? ? ? return (n == blk_cnt) ? 0 : -1;
+}
+

common/env_mmc.c

Quoted 10 lines
common/env_mmc.c new file +10 -0
+void env_relocate_spec(void)
+{
+#if !defined(ENV_IS_EMBEDDED)
+ ? ? ? struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+
+ ? ? ? if (init_mmc_for_env(mmc))
+ ? ? ? ? ? ? ? return;
+
+ ? ? ? if (read_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, env_ptr))
+ ? ? ? ? ? ? ? return use_default();

This is broken. env_ptr hasn't been initialized to a value, yet! This writes to random memory! env_ptr needs to be malloc'ed.

Andy