cmd_mac: Move conditional compilation to Makefile

finish remaning CFG_ID_EEPROM in CONFIG_ID_EEPROM
start in commit ad8f8687b78c3e917b173f038926695383c55555

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/common/Makefile b/common/Makefile
index e9f75f441db0eb24f573e74a157ee16663821928..a9a02b2e03c121963ec935a983de6c19e8cf81e7 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -111,7 +111,7 @@ COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o
 COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o
 COBJS-y += cmd_load.o
 COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
-COBJS-y += cmd_mac.o
+COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o
 COBJS-y += cmd_mem.o
 COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
 COBJS-$(CONFIG_MII) += miiphyutil.o

diff --git a/common/cmd_mac.c b/common/cmd_mac.c
index faed8f763ca7c8fab218bf459de6eb6b07c9bd23..4453299fe5959a364121ca686dd2c37db66515fb 100644 (file)
--- a/common/cmd_mac.c
+++ b/common/cmd_mac.c
@@ -24,8 +24,6 @@
 #include <common.h>
 #include <command.h>
 
-#ifdef CFG_ID_EEPROM
-
 extern int do_mac(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 U_BOOT_CMD(
@@ -63,4 +61,3 @@ U_BOOT_CMD(
        "mac 7\n"
        "    - program the MAC address for port 7\n"
 );
-#endif /* CFG_ID_EEPROM */

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 17cc934e4415f539ebc24052d7144db1ddc8c82a..dc304e7bcaf4250ab8c1990b786422128d2cf0a4 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -301,8 +301,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * I2C2 EEPROM
  */
-#define CFG_ID_EEPROM
-#ifdef CFG_ID_EEPROM
+#define CONFIG_ID_EEPROM
+#ifdef CONFIG_ID_EEPROM
 #define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_NXID
 #endif

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 0c1c4fc7c4edf6599bf118127b49e358a8a46f90..7c695828045d6188c3cfc532ec5cd42bff76425b 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -139,7 +139,7 @@
 
 #define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_NXID
-#define CFG_ID_EEPROM
+#define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_ADDR     0x57
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 54a04610753717c5d6cee0c8cde3395f0b6f1e7a..a57c30331bdf2316d8a66017ff6adf4dcafe99b4 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -151,7 +151,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_NXID
-#define CFG_ID_EEPROM
+#define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_ADDR     0x57
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index ddca527c4e14ab8a01852f4ae3f2eb1d8663c55b..c84240e03de5e64952af48147ad0f2f4a6207048 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -179,7 +179,7 @@
 
 #endif
 
-/* #define CFG_ID_EEPROM       1
+/* #define CONFIG_ID_EEPROM    1
 #define ID_EEPROM_ADDR 0x57 */
 
 /*

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index c8f075f5a683b37bf753c63de140ec2d4ac56f20..4d02eb2850db5ca6f56a7f57384936117247bcc0 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -873,7 +873,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        sc3_read_eeprom();
 #endif
 
-#if defined (CFG_ID_EEPROM) || defined (CFG_I2C_MAC_OFFSET)
+#if defined (CONFIG_ID_EEPROM) || defined (CFG_I2C_MAC_OFFSET)
        mac_read_from_eeprom();
 #endif
 

diff --git a/lib_sparc/board.c b/lib_sparc/board.c
index 205a8ca5327b0e1309d3b7603903640d92e363b6..15d69355ea3c65c617f540c5150c26c2e199aa14 100644 (file)
--- a/lib_sparc/board.c
+++ b/lib_sparc/board.c
@@ -409,7 +409,7 @@ void board_init_f(ulong bootflag)
        }
 #endif
 
-#ifdef CFG_ID_EEPROM
+#ifdef CONFIG_ID_EEPROM
        mac_read_from_eeprom();
 #endif