Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove support for CONFIG_HAS_UID and "forceenv" command

Browse Source 
This (undocumented) concept was only in use for the MVSMR and
davinci_schmoogie Sergey Kubushyn <ksi@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 <wd@denx.de>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
Cc: Sergey Kubushyn <ksi@koi8.net>
Acked-by: Sergey Kubushyn <ksi@koi8.net>
master
Wolfgang Denk 15 years ago
parent a6826fbc5c
commit 6d014adfa2
7 changed files with 0 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      common/cmd_nvedit.c
  2. 3
      common/exports.c
  3. 1
      include/_exports.h
  4. 3
      include/common.h
  5. 1
      include/configs/MVSMR.h
  6. 1
      include/configs/davinci_schmoogie.h
  7. 3
      include/exports.h

13
common/cmd_nvedit.c
Unescape View File

@ -248,12 +248,7 @@ int _do_setenv (int flag, int argc, char * const argv[])
* ver is readonly. * ver is readonly.
*/ */
if ( if (
#ifdef CONFIG_HAS_UID
/* Allow serial# forced overwrite with 0xdeaf4add flag */
((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add)) ||
#else
(strcmp (name, "serial#") == 0) || (strcmp (name, "serial#") == 0) ||
#endif
((strcmp (name, "ethaddr") == 0) ((strcmp (name, "ethaddr") == 0)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR) #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
&& (strcmp ((char *)env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0) && (strcmp ((char *)env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)
@ -398,14 +393,6 @@ int setenv (char *varname, char *varvalue)
return _do_setenv (0, 3, argv); 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[]) int do_setenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
if (argc < 2) if (argc < 2)

3
common/exports.c
Unescape View File

@ -34,9 +34,6 @@ unsigned long get_version(void)
# define spi_release_bus dummy # define spi_release_bus dummy
# define spi_xfer dummy # define spi_xfer dummy
#endif #endif
#ifndef CONFIG_HAS_UID
# define forceenv dummy
#endif
void jumptable_init(void) void jumptable_init(void)
{ {

1
include/_exports.h
Unescape View File

@ -18,7 +18,6 @@ EXPORT_FUNC(vprintf)
EXPORT_FUNC(do_reset) EXPORT_FUNC(do_reset)
EXPORT_FUNC(getenv) EXPORT_FUNC(getenv)
EXPORT_FUNC(setenv) EXPORT_FUNC(setenv)
EXPORT_FUNC(forceenv)
EXPORT_FUNC(simple_strtoul) EXPORT_FUNC(simple_strtoul)
EXPORT_FUNC(simple_strtol) EXPORT_FUNC(simple_strtol)
EXPORT_FUNC(strcmp) EXPORT_FUNC(strcmp)

3
include/common.h
Unescape View File

@ -262,9 +262,6 @@ int saveenv (void);
int inline setenv (char *, char *); int inline setenv (char *, char *);
#else #else
int setenv (char *, char *); int setenv (char *, char *);
#ifdef CONFIG_HAS_UID
void forceenv (char *, char *);
#endif
#endif /* CONFIG_PPC */ #endif /* CONFIG_PPC */
#ifdef CONFIG_ARM #ifdef CONFIG_ARM
# include <asm/mach-types.h> # include <asm/mach-types.h>

1
include/configs/MVSMR.h
Unescape View File

@ -185,7 +185,6 @@
*/ */
#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_SYS_FLASH_PROTECTION #undef CONFIG_SYS_FLASH_PROTECTION
#define CONFIG_HAS_UID
#define CONFIG_OVERWRITE_ETHADDR_ONCE #define CONFIG_OVERWRITE_ETHADDR_ONCE
#define CONFIG_ENV_OFFSET 0x8000 #define CONFIG_ENV_OFFSET 0x8000

1
include/configs/davinci_schmoogie.h
Unescape View File

@ -99,7 +99,6 @@
/*=====================*/ /*=====================*/
#define CONFIG_RTC_DS1307 /* RTC chip on SCHMOOGIE */ #define CONFIG_RTC_DS1307 /* RTC chip on SCHMOOGIE */
#define CONFIG_SYS_I2C_RTC_ADDR 0x6f /* RTC chip I2C address */ #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_UID_DS28CM00 /* Unique ID on SCHMOOGIE */
#define CONFIG_SYS_UID_ADDR 0x50 /* UID chip I2C address */ #define CONFIG_SYS_UID_ADDR 0x50 /* UID chip I2C address */
/*==============================*/ /*==============================*/

3
include/exports.h
Unescape View File

@ -26,9 +26,6 @@ int setenv (char *varname, char *varvalue);
long simple_strtol(const char *cp,char **endp,unsigned int base); long simple_strtol(const char *cp,char **endp,unsigned int base);
int strcmp(const char * cs,const char * ct); int strcmp(const char * cs,const char * ct);
int ustrtoul(const char *cp, char **endp, unsigned int base); 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) #if defined(CONFIG_CMD_I2C)
int i2c_write (uchar, uint, int , uchar* , int); int i2c_write (uchar, uint, int , uchar* , int);
int i2c_read (uchar, uint, int , uchar* , int); int i2c_read (uchar, uint, int , uchar* , int);

Write Preview
Loading…
Cancel
Save