Signed-off-by: Tom Rini trini@konsulko.com --- README | 2 +- doc/README.usb | 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/MCR3000.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis-tk1.h | 4 ++-- include/configs/apalis_imx6.h | 4 ++-- include/configs/cobra5272.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 4 ++-- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/integratorcp.h | 2 +- include/configs/mt7622.h | 2 +- include/configs/mt7623.h | 2 +- include/configs/mt7629.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/poleg.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 30 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/README b/README index 50bfd7e4fffc..d09ebd47cd83 100644 --- a/README +++ b/README @@ -735,7 +735,7 @@ The following options need to be configured: command issued before MII status register can be read
- IP address: - CONFIG_IPADDR + CFG_IPADDR
Define a default value for the IP address to use for the default Ethernet interface, in case this is not diff --git a/doc/README.usb b/doc/README.usb index 650a6daae0a5..495b1859a771 100644 --- a/doc/README.usb +++ b/doc/README.usb @@ -162,7 +162,7 @@ common executable is discouraged, as it leads to potential conflicts, and all the parameters can either get stored in the board's external environment, or get obtained from the bootp server if not set.
-#define CONFIG_IPADDR 10.0.0.2 (replace with your value) +#define CFG_IPADDR 10.0.0.2 (replace with your value) #define CONFIG_SERVERIP 10.0.0.1 (replace with your value) #define CONFIG_BOOTFILE "uImage"
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index ce75c4cbcaf0..647e23f380b8 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -18,7 +18,7 @@ /* I2C */
#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 8cebf099f1db..7bc86eb8b5f6 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -27,7 +27,7 @@
/* this must be included AFTER the definition of CONFIG COMMANDS (if any) */ #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 10bfb01a2e03..4b88cfc2cdd9 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -30,7 +30,7 @@ env/embedded.o(.text);
#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index b69e452b9e50..f34985c47d4b 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -30,7 +30,7 @@ env/embedded.o(.text*);
#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index ce38b823436d..5afd8383c1bd 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -31,7 +31,7 @@ /* I2C */
#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 2dc22a0b5af8..9d5f0e1c0964 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -23,7 +23,7 @@ /* I2C */
#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index bce4a8470f91..807d591c9f12 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -25,7 +25,7 @@ /* I2C */
#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 6e7b6e81208f..d61ed82ab3bf 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -52,7 +52,7 @@ "${ofl_args}; " \ "bootm ${loadaddr} - 0xf00000\0"
-#define CONFIG_IPADDR 192.168.0.3 +#define CFG_IPADDR 192.168.0.3 #define CONFIG_SERVERIP 192.168.0.1 #define CONFIG_NETMASK 255.0.0.0
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 2ce8597c0c52..d2a70aa88f88 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -325,7 +325,7 @@ * Environment Configuration */
-#define CONFIG_IPADDR 192.168.1.253 +#define CFG_IPADDR 192.168.1.253
#define CFG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 15bedc0afc29..0258a70d923b 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -14,7 +14,7 @@ #define USDHC2_BASE_ADDR 0x5b020000
/* Networking */ -#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index f0a02ae17953..4db3465cd9b7 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -33,8 +33,8 @@ func(PXE, pxe, na) \ func(DHCP, dhcp, na)
-#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4899dfb4dee1..8db2909c96b2 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -35,8 +35,8 @@
/* Command definition */
-#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 6d6e2fc69620..1b5115f7caf1 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -91,7 +91,7 @@ enter a valid image address in flash */
/* User network settings */
-#define CONFIG_IPADDR 192.168.100.2 /* default board IP address */ +#define CFG_IPADDR 192.168.100.2 /* default board IP address */ #define CONFIG_SERVERIP 192.168.100.1 /* default tftp server IP address */
#endif diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index a748d4f3169f..4f5287b6bcfb 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR 0 #define CFG_SYS_FSL_USDHC_NUM 1
-#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index e4bb71d47d62..35f29da0c351 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -14,7 +14,7 @@ #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000
-#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 0486db6b51ed..2f30322bb4f8 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -30,8 +30,8 @@
/* Command definition */
-#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 99ed8183ef21..0da7553e0245 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -21,7 +21,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #endif
-#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index ef49969598c9..808d69d0c865 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -16,7 +16,7 @@
/* NAND support */
-#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 4d0a78c6269c..e71f10a24fa1 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -57,7 +57,7 @@ /* Persistent Environment Config */
/* Environment */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.146
#endif /* __CONFIG_H */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 25bb41ebc46c..ccf73604480b 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -20,7 +20,7 @@ #define CFG_SYS_HZ_CLOCK 1000000 /* Timer 1 is clocked at 1Mhz */
#define CONFIG_SERVERIP 192.168.1.100 -#define CONFIG_IPADDR 192.168.1.104 +#define CFG_IPADDR 192.168.1.104
/* * Miscellaneous configurable options diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index 8c297266d8b1..199da46ad018 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -18,7 +18,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000
/* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.3
#endif diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 031c1aea0c00..d3cf6597a633 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -33,7 +33,7 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
/* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.2
#ifdef CONFIG_DISTRO_DEFAULTS diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index bfa44aacc726..8c0b02b40e50 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -28,7 +28,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000
/* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.2
#endif diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 204a9b0b5458..0d38645c0e60 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -15,7 +15,7 @@ 115200, 230400, 460800, 921600 }
/* Default Env vars */ -#define CONFIG_IPADDR 0.0.0.0 /* In order to cause an error */ +#define CFG_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 CFG_GATEWAYIP 0.0.0.0 diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 7998ef7347fb..3e4309512cc1 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -15,7 +15,7 @@
/* Default environemnt variables */ #define CONFIG_SERVERIP 192.168.0.1 -#define CONFIG_IPADDR 192.168.0.2 +#define CFG_IPADDR 192.168.0.2 #define CONFIG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 874f75404712..3ec3caade49c 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -47,7 +47,7 @@ * Network Configuration */ #define CONFIG_SERVERIP 192.168.11.1 -#define CONFIG_IPADDR 192.168.11.10 +#define CFG_IPADDR 192.168.11.10 #define CFG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0
diff --git a/include/env_default.h b/include/env_default.h index b1fe945bae5b..5ee28a54960d 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -53,8 +53,8 @@ const char default_environment[] = { #ifdef CONFIG_ETHPRIME "ethprime=" CONFIG_ETHPRIME "\0" #endif -#ifdef CONFIG_IPADDR - "ipaddr=" __stringify(CONFIG_IPADDR) "\0" +#ifdef CFG_IPADDR + "ipaddr=" __stringify(CFG_IPADDR) "\0" #endif #ifdef CONFIG_SERVERIP "serverip=" __stringify(CONFIG_SERVERIP) "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 48de265ee7e1..9e927d81200a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -65,7 +65,7 @@ CFG_I2C_MVTWSI_BASE1 CFG_I2C_RTC_ADDR CFG_ICS307_REFCLK_HZ CFG_IMX6_PWM_PER_CLK -CONFIG_IPADDR +CFG_IPADDR CONFIG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE