Signed-off-by: Tom Rini trini@konsulko.com --- README | 2 +- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/README b/README index 02ae72e009ef..d76058e1ab41 100644 --- a/README +++ b/README @@ -750,7 +750,7 @@ The following options need to be configured: (Environment variable "serverip")
- Gateway IP address: - CONFIG_GATEWAYIP + CFG_GATEWAYIP
Defines a default value for the IP address of the default router where packets to other networks are diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index ef3837e137c7..83ffe7ce76d9 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -21,7 +21,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */
#define CONFIG_HOSTNAME "M5208EVBe" diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index a31d44177362..fc56834bd9be 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -30,7 +30,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */
#define CONFIG_HOSTNAME "M5235EVB" diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 501785ac82e0..78eeca342c82 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -33,7 +33,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */
#define CONFIG_HOSTNAME "M5272C3" diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 3912aae750d4..afc19de8ce73 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -33,7 +33,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */
#define CONFIG_HOSTNAME "M5282EVB" diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 6d97e6ca84ab..1fcc34184928 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -34,7 +34,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */
#define CONFIG_HOSTNAME "M53017" diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index f8aabe4944a4..a49cf6dacb81 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -26,7 +26,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */
#define CONFIG_HOSTNAME "M5329EVB" diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 228fcde98dc3..53434881f4c7 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -28,7 +28,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */
#define CONFIG_HOSTNAME "M5373EVB" diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 515e88cf8206..e93b3cb97517 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -332,7 +332,7 @@ #define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */
#define CONFIG_SERVERIP 192.168.1.1 -#define CONFIG_GATEWAYIP 192.168.1.1 +#define CFG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0
#define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index c8c0fc671ab0..204a9b0b5458 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -18,7 +18,7 @@ #define CONFIG_IPADDR 0.0.0.0 /* In order to cause an error */ #define CONFIG_SERVERIP 0.0.0.0 /* In order to cause an error */ #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_GATEWAYIP 0.0.0.0 +#define CFG_GATEWAYIP 0.0.0.0 #define CONFIG_ROOTPATH "/srv/nfs/" /* Default Dir for NFS */
#define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 2fe056cfef4a..874f75404712 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -48,7 +48,7 @@ */ #define CONFIG_SERVERIP 192.168.11.1 #define CONFIG_IPADDR 192.168.11.10 -#define CONFIG_GATEWAYIP 192.168.11.1 +#define CFG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0
#if defined(CONFIG_ARM64) diff --git a/include/env_default.h b/include/env_default.h index 1621815f257a..7d0af83a5913 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -68,8 +68,8 @@ const char default_environment[] = { #ifdef CONFIG_ROOTPATH "rootpath=" CONFIG_ROOTPATH "\0" #endif -#ifdef CONFIG_GATEWAYIP - "gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0" +#ifdef CFG_GATEWAYIP + "gatewayip=" __stringify(CFG_GATEWAYIP) "\0" #endif #ifdef CONFIG_NETMASK "netmask=" __stringify(CONFIG_NETMASK) "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea7eaef5d15f..e634d868a090 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -47,7 +47,7 @@ CFG_FSL_PMIC_MODE CFG_FSL_SDHC_V2_3 CFG_FSL_SERDES1 CFG_FSL_SERDES2 -CONFIG_GATEWAYIP +CFG_GATEWAYIP CONFIG_GMII CONFIG_G_DNL_THOR_PRODUCT_NUM CONFIG_G_DNL_THOR_VENDOR_NUM