diff options
Diffstat (limited to 'common/env_common.c')
| -rw-r--r-- | common/env_common.c | 97 | 
1 files changed, 1 insertions, 96 deletions
| diff --git a/common/env_common.c b/common/env_common.c index 61c4be54d..3d3cb70a6 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -37,102 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;  /************************************************************************   * Default settings to be used when no valid environment is found   */ - -const uchar default_environment[] = { -#ifdef	CONFIG_BOOTARGS -	"bootargs="	CONFIG_BOOTARGS			"\0" -#endif -#ifdef	CONFIG_BOOTCOMMAND -	"bootcmd="	CONFIG_BOOTCOMMAND		"\0" -#endif -#ifdef	CONFIG_RAMBOOTCOMMAND -	"ramboot="	CONFIG_RAMBOOTCOMMAND		"\0" -#endif -#ifdef	CONFIG_NFSBOOTCOMMAND -	"nfsboot="	CONFIG_NFSBOOTCOMMAND		"\0" -#endif -#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) -	"bootdelay="	__stringify(CONFIG_BOOTDELAY)	"\0" -#endif -#if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0) -	"baudrate="	__stringify(CONFIG_BAUDRATE)	"\0" -#endif -#ifdef	CONFIG_LOADS_ECHO -	"loads_echo="	__stringify(CONFIG_LOADS_ECHO)	"\0" -#endif -#ifdef	CONFIG_ETHADDR -	"ethaddr="	__stringify(CONFIG_ETHADDR)	"\0" -#endif -#ifdef	CONFIG_ETH1ADDR -	"eth1addr="	__stringify(CONFIG_ETH1ADDR)	"\0" -#endif -#ifdef	CONFIG_ETH2ADDR -	"eth2addr="	__stringify(CONFIG_ETH2ADDR)	"\0" -#endif -#ifdef	CONFIG_ETH3ADDR -	"eth3addr="	__stringify(CONFIG_ETH3ADDR)	"\0" -#endif -#ifdef	CONFIG_ETH4ADDR -	"eth4addr="	__stringify(CONFIG_ETH4ADDR)	"\0" -#endif -#ifdef	CONFIG_ETH5ADDR -	"eth5addr="	__stringify(CONFIG_ETH5ADDR)	"\0" -#endif -#ifdef	CONFIG_ETHPRIME -	"ethprime="	CONFIG_ETHPRIME			"\0" -#endif -#ifdef	CONFIG_IPADDR -	"ipaddr="	__stringify(CONFIG_IPADDR)	"\0" -#endif -#ifdef	CONFIG_SERVERIP -	"serverip="	__stringify(CONFIG_SERVERIP)	"\0" -#endif -#ifdef	CONFIG_SYS_AUTOLOAD -	"autoload="	CONFIG_SYS_AUTOLOAD		"\0" -#endif -#ifdef	CONFIG_PREBOOT -	"preboot="	CONFIG_PREBOOT			"\0" -#endif -#ifdef	CONFIG_ROOTPATH -	"rootpath="	CONFIG_ROOTPATH			"\0" -#endif -#ifdef	CONFIG_GATEWAYIP -	"gatewayip="	__stringify(CONFIG_GATEWAYIP)	"\0" -#endif -#ifdef	CONFIG_NETMASK -	"netmask="	__stringify(CONFIG_NETMASK)	"\0" -#endif -#ifdef	CONFIG_HOSTNAME -	"hostname="	__stringify(CONFIG_HOSTNAME)	"\0" -#endif -#ifdef	CONFIG_BOOTFILE -	"bootfile="	CONFIG_BOOTFILE			"\0" -#endif -#ifdef	CONFIG_LOADADDR -	"loadaddr="	__stringify(CONFIG_LOADADDR)	"\0" -#endif -#ifdef	CONFIG_CLOCKS_IN_MHZ -	"clocks_in_mhz=1\0" -#endif -#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0) -	"pcidelay="	__stringify(CONFIG_PCI_BOOTDELAY)"\0" -#endif -#ifdef	CONFIG_ENV_VARS_UBOOT_CONFIG -	"arch="		CONFIG_SYS_ARCH			"\0" -	"cpu="		CONFIG_SYS_CPU			"\0" -	"board="	CONFIG_SYS_BOARD		"\0" -#ifdef CONFIG_SYS_VENDOR -	"vendor="	CONFIG_SYS_VENDOR		"\0" -#endif -#ifdef CONFIG_SYS_SOC -	"soc="		CONFIG_SYS_SOC			"\0" -#endif -#endif -#ifdef	CONFIG_EXTRA_ENV_SETTINGS -	CONFIG_EXTRA_ENV_SETTINGS -#endif -	"\0" -}; +#include <env_default.h>  struct hsearch_data env_htab = {  	.apply = env_check_apply, |