On Sat, 17 Jul 2010, Wolfgang Denk wrote:
Ack by: Sergey Kubushyn <k...@koi8.net>
---
> This (undocumented) concept was only in use for the MVSMR and
> davinci_schmoogie Sergey Kubushyn <k...@koi8.net> boards.
> Drop it for now. If really needed, it should be reimplemented
> later in the context of the new environment command set.
>
> Signed-off-by: Wolfgang Denk <w...@denx.de>
> Cc: Andre Schwarz <andre.schw...@matrix-vision.de>
> Cc: Sergey Kubushyn <k...@koi8.net>
> ---
> common/cmd_nvedit.c | 13 -------------
> common/exports.c | 3 ---
> include/_exports.h | 1 -
> include/common.h | 3 ---
> include/configs/MVSMR.h | 1 -
> include/configs/davinci_schmoogie.h | 1 -
> include/exports.h | 3 ---
> 7 files changed, 0 insertions(+), 25 deletions(-)
>
> diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
> index 13325bc..8c86f15 100644
> --- a/common/cmd_nvedit.c
> +++ b/common/cmd_nvedit.c
> @@ -247,12 +247,7 @@ int _do_setenv (int flag, int argc, char * const argv[])
> * ver is readonly.
> */
> if (
> -#ifdef CONFIG_HAS_UID
> - /* Allow serial# forced overwrite with 0xdeaf4add flag */
> - ((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add)) ||
> -#else
> (strcmp (name, "serial#") == 0) ||
> -#endif
> ((strcmp (name, "ethaddr") == 0)
> #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
> && (strcmp ((char
> *)env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)
> @@ -397,14 +392,6 @@ int setenv (char *varname, char *varvalue)
> return _do_setenv (0, 3, argv);
> }
>
> -#ifdef CONFIG_HAS_UID
> -void forceenv (char *varname, char *varvalue)
> -{
> - char * const argv[4] = { "forceenv", varname, varvalue, NULL };
> - _do_setenv (0xdeaf4add, 3, argv);
> -}
> -#endif
> -
> int do_setenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
> {
> if (argc < 2) {
> diff --git a/common/exports.c b/common/exports.c
> index cefe6f6..bde52a6 100644
> --- a/common/exports.c
> +++ b/common/exports.c
> @@ -35,9 +35,6 @@ unsigned long get_version(void)
> # define spi_release_bus dummy
> # define spi_xfer dummy
> #endif
> -#ifndef CONFIG_HAS_UID
> -# define forceenv dummy
> -#endif
>
> void jumptable_init(void)
> {
> diff --git a/include/_exports.h b/include/_exports.h
> index f3df568..d89b65b 100644
> --- a/include/_exports.h
> +++ b/include/_exports.h
> @@ -18,7 +18,6 @@ EXPORT_FUNC(vprintf)
> EXPORT_FUNC(do_reset)
> EXPORT_FUNC(getenv)
> EXPORT_FUNC(setenv)
> -EXPORT_FUNC(forceenv)
> EXPORT_FUNC(simple_strtoul)
> EXPORT_FUNC(simple_strtol)
> EXPORT_FUNC(strcmp)
> diff --git a/include/common.h b/include/common.h
> index e4b4ec0..5eef9c7 100644
> --- a/include/common.h
> +++ b/include/common.h
> @@ -262,9 +262,6 @@ int saveenv (void);
> int inline setenv (char *, char *);
> #else
> int setenv (char *, char *);
> -#ifdef CONFIG_HAS_UID
> -void forceenv (char *, char *);
> -#endif
> #endif /* CONFIG_PPC */
> #ifdef CONFIG_ARM
> # include <asm/mach-types.h>
> diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
> index 6492068..000c4c6 100644
> --- a/include/configs/MVSMR.h
> +++ b/include/configs/MVSMR.h
> @@ -185,7 +185,6 @@
> */
> #define CONFIG_ENV_IS_IN_FLASH
> #undef CONFIG_SYS_FLASH_PROTECTION
> -#define CONFIG_HAS_UID
> #define CONFIG_OVERWRITE_ETHADDR_ONCE
>
> #define CONFIG_ENV_OFFSET 0x8000
> diff --git a/include/configs/davinci_schmoogie.h
> b/include/configs/davinci_schmoogie.h
> index 875dda4..04cdc21 100644
> --- a/include/configs/davinci_schmoogie.h
> +++ b/include/configs/davinci_schmoogie.h
> @@ -99,7 +99,6 @@
> /*=====================*/
> #define CONFIG_RTC_DS1307 /* RTC chip on SCHMOOGIE */
> #define CONFIG_SYS_I2C_RTC_ADDR 0x6f /* RTC chip I2C address */
> -#define CONFIG_HAS_UID
> #define CONFIG_UID_DS28CM00 /* Unique ID on SCHMOOGIE */
> #define CONFIG_SYS_UID_ADDR 0x50 /* UID chip I2C address */
> /*==============================*/
> diff --git a/include/exports.h b/include/exports.h
> index 1d79a31..7404a7c 100644
> --- a/include/exports.h
> +++ b/include/exports.h
> @@ -26,9 +26,6 @@ int setenv (char *varname, char *varvalue);
> long simple_strtol(const char *cp,char **endp,unsigned int base);
> int strcmp(const char * cs,const char * ct);
> int ustrtoul(const char *cp, char **endp, unsigned int base);
> -#ifdef CONFIG_HAS_UID
> -void forceenv (char *varname, char *varvalue);
> -#endif
> #if defined(CONFIG_CMD_I2C)
> int i2c_write (uchar, uint, int , uchar* , int);
> int i2c_read (uchar, uint, int , uchar* , int);
> --
> 1.7.1.1
>
---
******************************************************************
* k...@home KOI8 Net < > The impossible we do immediately. *
* Las Vegas NV, USA < > Miracles require 24-hour notice. *
******************************************************************
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
