@@ -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
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 */
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" \
@@ -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
@@ -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"
@@ -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
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(-)