Hi Alagu Sankar,
Pls use my latest v5 patch for saving environment data to mmc.
Thanks~~
Yours
Terry
> -----Original Message-----
> From: u-boot-boun...@lists.denx.de
> [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Alagu Sankar
> Sent: 2010年5月12日 17:38
> To: u-boot@lists.denx.de
> Subject: [U-Boot] [PATCH 4/4] Environment in MMC
>
> This patch is to save environment data to mmc card. It uses
> interfaces defined in generic MMC framework. This is enabled
> with CONFIG_ENV_IS_IN_MMC option.
> Based on the earlier patch from Terry Lv at Freescale
>
> Signed-off-by: Alagu Sankar <alagusan...@embwise.com>
> ---
> arch/arm/lib/board.c | 10 ++--
> arch/powerpc/lib/board.c | 12 ++--
> common/Makefile | 1 +
> common/cmd_nvedit.c | 3 +-
> common/env_mmc.c | 168
> ++++++++++++++++++++++++++++++++++++++++++++++
> include/environment.h | 18 +++++
> 6 files changed, 200 insertions(+), 12 deletions(-) create
> mode 100644 common/env_mmc.c
>
> diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
> index f5660a9..5e7558e 100644
> --- a/arch/arm/lib/board.c
> +++ b/arch/arm/lib/board.c
> @@ -338,6 +338,11 @@ void start_armboot (void)
> nand_init(); /* go init the NAND */
> #endif
>
> +#ifdef CONFIG_GENERIC_MMC
> + puts ("MMC: ");
> + mmc_initialize (gd->bd);
> +#endif
> +
> #if defined(CONFIG_CMD_ONENAND)
> onenand_init();
> #endif
> @@ -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
> diff --git a/arch/powerpc/lib/board.c
> b/arch/powerpc/lib/board.c index 7b09fb5..1008635 100644
> --- a/arch/powerpc/lib/board.c
> +++ b/arch/powerpc/lib/board.c
> @@ -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: ");
> diff --git a/common/Makefile b/common/Makefile index
> dbf7a05..2c37073 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -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 diff
> --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index
> eb89e9e..27e46f7 100644
> --- a/common/cmd_nvedit.c
> +++ b/common/cmd_nvedit.c
> @@ -63,9 +63,10 @@ DECLARE_GLOBAL_DATA_PTR;
> !defined(CONFIG_ENV_IS_IN_NVRAM) && \
> !defined(CONFIG_ENV_IS_IN_ONENAND) && \
> !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \
> + !defined(CONFIG_ENV_IS_IN_MMC) && \
> !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
> diff --git a/common/env_mmc.c b/common/env_mmc.c new file
> mode 100644 index 0000000..ef7e5fb
> --- /dev/null
> +++ b/common/env_mmc.c
> @@ -0,0 +1,168 @@
> +/*
> + * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
> + * (C) Copyright 2000-2006
> + * Wolfgang Denk, DENX Software Engineering, w...@denx.de.
> + *
> + * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH
> <www.elinos.com>
> + * Andreas Heppel <ahep...@sysgo.de>
> +
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +/* #define DEBUG */
> +
> +#include <common.h>
> +
> +#include <command.h>
> +#include <environment.h>
> +#include <linux/stddef.h>
> +#include <malloc.h>
> +#include <mmc.h>
> +
> +#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_MMC) #define
> +CMD_SAVEENV #elif defined(CONFIG_ENV_OFFSET_REDUND) #error
> Cannot use
> +CONFIG_ENV_OFFSET_REDUND without \
> + CONFIG_CMD_ENV & CONFIG_CMD_MMC
> +#endif
> +
> +#if defined(CONFIG_ENV_SIZE_REDUND) && \
> + (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE) #error
> +CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE #endif
> +
> +/* references to names in env_common.c */ extern uchar
> +default_environment[];
> +
> +char *env_name_spec = "MMC";
> +
> +#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 */
> +
> +/* local functions */
> +#if !defined(ENV_IS_EMBEDDED)
> +static void use_default(void);
> +#endif
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +uchar env_get_char_spec(int index)
> +{
> + return *((uchar *)(gd->env_addr + index)); }
> +
> +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) {
> + if (!mmc) {
> + puts("No MMC card found\n");
> + return -1;
> + }
> +
> + if (mmc_init(mmc)) {
> + puts("MMC init failed\n");
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +#ifdef CMD_SAVEENV
> +
> +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;
> +
> + blk_start = (offset % 512) ? ((offset / 512) + 1) :
> (offset / 512);
> + blk_cnt = (size % 512) ? ((size / 512) + 1) : (size / 512);
> + n = mmc->block_dev.block_write(0, blk_start , blk_cnt,
> + (u_char *)buffer);
> +
> + return (n == blk_cnt) ? 0 : -1;
> +}
> +
> +int saveenv(void)
> +{
> + struct mmc *mmc = find_mmc_device(0);
> +
> + if (init_mmc_for_env(mmc))
> + return 1;
> +
> + puts("Writing to MMC... ");
> + if (write_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET,
> env_ptr)) {
> + puts("failed\n");
> + return 1;
> + }
> +
> + puts("done\n");
> + return 0;
> +}
> +#endif /* CMD_SAVEENV */
> +
> +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;
> +
> + blk_start = (offset % 512) ? ((offset / 512) + 1) :
> (offset / 512);
> + blk_cnt = (size % 512) ? ((size / 512) + 1) : (size / 512);
> +
> + n = mmc->block_dev.block_read(0, blk_start, blk_cnt,
> (uchar *)buffer);
> +
> + return (n == blk_cnt) ? 0 : -1;
> +}
> +
> +void env_relocate_spec(void)
> +{
> +#if !defined(ENV_IS_EMBEDDED)
> + struct mmc *mmc = find_mmc_device(0);
> +
> + if (init_mmc_for_env(mmc))
> + return;
> +
> + if (read_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, env_ptr))
> + return use_default();
> +
> + if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)
> + return use_default();
> +
> +#endif /* ! ENV_IS_EMBEDDED */
> +}
> +
> +#if !defined(ENV_IS_EMBEDDED)
> +static void use_default()
> +{
> + puts ("*** Warning - bad CRC or MMC, using default
> environment\n\n");
> + set_default_env();
> +}
> +#endif
> +
> diff --git a/include/environment.h b/include/environment.h
> index b9924fd..aa0e750 100644
> --- a/include/environment.h
> +++ b/include/environment.h
> @@ -94,6 +94,24 @@
> # endif
> #endif /* CONFIG_ENV_IS_IN_MG_DISK */
>
> +#if defined(CONFIG_ENV_IS_IN_MMC)
> +# ifndef CONFIG_ENV_OFFSET
> +# error "Need to define CONFIG_ENV_OFFSET when using
> CONFIG_ENV_IS_IN_MMC"
> +# endif
> +# ifndef CONFIG_ENV_ADDR
> +# define CONFIG_ENV_ADDR (CONFIG_ENV_OFFSET)
> +# endif
> +# ifndef CONFIG_ENV_OFFSET
> +# define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) # endif # ifdef
> +CONFIG_ENV_OFFSET_REDUND # define
> CONFIG_SYS_REDUNDAND_ENVIRONMENT #
> +endif # ifdef CONFIG_ENV_IS_EMBEDDED
> +# define ENV_IS_EMBEDDED 1
> +# endif
> +#endif /* CONFIG_ENV_IS_IN_MMC */
> +
> /* Embedded env is only supported for some flash types */
> #ifdef CONFIG_ENV_IS_EMBEDDED # if
> !defined(CONFIG_ENV_IS_IN_FLASH) && \
> --
> 1.6.0.6
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
>
--- Begin Message ---
This patch is to save environment data to mmc card.
It uses interfaces defined in generic mmc.
Signed-off-by: Terry Lv <r65...@freescale.com>
---
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
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index f5660a9..9ef37d0 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -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
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 7b09fb5..6850633 100644
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -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: ");
diff --git a/common/Makefile b/common/Makefile
index dbf7a05..2c37073 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -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
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index eb89e9e..57dc288 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -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
diff --git a/common/env_mmc.c b/common/env_mmc.c
new file mode 100644
index 0000000..c9a9415
--- /dev/null
+++ b/common/env_mmc.c
@@ -0,0 +1,154 @@
+/*
+ * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/* #define DEBUG */
+
+#include <common.h>
+
+#include <command.h>
+#include <environment.h>
+#include <linux/stddef.h>
+#include <malloc.h>
+#include <mmc.h>
+
+/* references to names in env_common.c */
+extern uchar default_environment[];
+
+char *env_name_spec = "MMC";
+
+#ifdef ENV_IS_EMBEDDED
+extern uchar environment[];
+env_t *env_ptr = (env_t *)(&environment[0]);
+#else /* ! ENV_IS_EMBEDDED */
+env_t *env_ptr = NULL;
+#endif /* ENV_IS_EMBEDDED */
+
+/* local functions */
+#if !defined(ENV_IS_EMBEDDED)
+static void use_default(void);
+#endif
+
+DECLARE_GLOBAL_DATA_PTR;
+
+uchar env_get_char_spec(int index)
+{
+ return *((uchar *)(gd->env_addr + index));
+}
+
+int env_init(void)
+{
+ /* use default */
+ gd->env_addr = (ulong)&default_environment[0];
+ gd->env_valid = 1;
+
+ return 0;
+}
+
+int init_mmc_for_env(struct mmc *mmc)
+{
+ if (!mmc) {
+ puts("No MMC card found\n");
+ return -1;
+ }
+
+ if (mmc_init(mmc)) {
+ puts("MMC init failed\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+#ifdef CONFIG_CMD_SAVEENV
+
+inline int write_env(struct mmc *mmc, unsigned long size,
+ unsigned long offset, const void *buffer)
+{
+ uint blk_start, blk_cnt, n;
+
+ blk_start = ALIGN(offset, mmc->write_bl_len) /
mmc->write_bl_len;
+ blk_cnt = ALIGN(size, mmc->write_bl_len) / mmc->write_bl_len;
+
+ n = mmc->block_dev.block_write(CONFIG_SYS_MMC_ENV_DEV,
blk_start,
+ blk_cnt, (u_char *)buffer);
+
+ return (n == blk_cnt) ? 0 : -1;
+}
+
+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, CONFIG_ENV_OFFSET, env_ptr))
{
+ puts("failed\n");
+ return 1;
+ }
+
+ puts("done\n");
+ return 0;
+}
+#endif /* CONFIG_CMD_SAVEENV */
+
+inline int read_env(struct mmc *mmc, unsigned long size,
+ unsigned long offset, const void *buffer)
+{
+ uint blk_start, blk_cnt, n;
+
+ blk_start = ALIGN(offset, mmc->read_bl_len) / mmc->read_bl_len;
+ blk_cnt = ALIGN(size, mmc->read_bl_len) / mmc->read_bl_len;
+
+ n = mmc->block_dev.block_read(CONFIG_SYS_MMC_ENV_DEV, blk_start,
+ blk_cnt, (uchar *)buffer);
+
+ return (n == blk_cnt) ? 0 : -1;
+}
+
+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();
+
+ if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)
+ return use_default();
+
+ gd->env_valid = 1;
+#endif
+}
+
+#if !defined(ENV_IS_EMBEDDED)
+static void use_default()
+{
+ puts ("*** Warning - bad CRC or MMC, using default
environment\n\n");
+ set_default_env();
+}
+#endif
+
--
1.6.0.4
--- End Message ---
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
