Convert CONFIG_HOSTNAME et al to Kconfig
This converts the following to Kconfig: CONFIG_GATEWAYIP CONFIG_HOSTNAME CONFIG_IPADDR CONFIG_NETMASK CONFIG_ROOTPATH CONFIG_SERVERIP CONFIG_UBOOTPATH To do this, we introduce a CONFIG_USE_ form of each of the above and change include/env_default.h to test for that to be set before setting a value. Further, we don't want to stringify the IP address related values as they are now properly strings via Kconfig. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
+11
-11
@@ -53,11 +53,11 @@ const char default_environment[] = {
|
||||
#ifdef CONFIG_ETHPRIME
|
||||
"ethprime=" CONFIG_ETHPRIME "\0"
|
||||
#endif
|
||||
#ifdef CONFIG_IPADDR
|
||||
"ipaddr=" __stringify(CONFIG_IPADDR) "\0"
|
||||
#ifdef CONFIG_USE_IPADDR
|
||||
"ipaddr=" CONFIG_IPADDR "\0"
|
||||
#endif
|
||||
#ifdef CONFIG_SERVERIP
|
||||
"serverip=" __stringify(CONFIG_SERVERIP) "\0"
|
||||
#ifdef CONFIG_USE_SERVERIP
|
||||
"serverip=" CONFIG_SERVERIP "\0"
|
||||
#endif
|
||||
#ifdef CONFIG_SYS_DISABLE_AUTOLOAD
|
||||
"autoload=0\0"
|
||||
@@ -65,17 +65,17 @@ const char default_environment[] = {
|
||||
#ifdef CONFIG_PREBOOT_DEFINED
|
||||
"preboot=" CONFIG_PREBOOT "\0"
|
||||
#endif
|
||||
#ifdef CONFIG_ROOTPATH
|
||||
#ifdef CONFIG_USE_ROOTPATH
|
||||
"rootpath=" CONFIG_ROOTPATH "\0"
|
||||
#endif
|
||||
#ifdef CONFIG_GATEWAYIP
|
||||
"gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0"
|
||||
#ifdef CONFIG_USE_GATEWAYIP
|
||||
"gatewayip=" CONFIG_GATEWAYIP "\0"
|
||||
#endif
|
||||
#ifdef CONFIG_NETMASK
|
||||
"netmask=" __stringify(CONFIG_NETMASK) "\0"
|
||||
#ifdef CONFIG_USE_NETMASK
|
||||
"netmask=" CONFIG_NETMASK "\0"
|
||||
#endif
|
||||
#ifdef CONFIG_HOSTNAME
|
||||
"hostname=" CONFIG_HOSTNAME "\0"
|
||||
#ifdef CONFIG_USE_HOSTNAME
|
||||
"hostname=" CONFIG_HOSTNAME "\0"
|
||||
#endif
|
||||
#ifdef CONFIG_USE_BOOTFILE
|
||||
"bootfile=" CONFIG_BOOTFILE "\0"
|
||||
|
||||
Reference in New Issue
Block a user