cmd_mac: Move conditional compilation to Makefile

finish remaning CFG_ID_EEPROM in CONFIG_ID_EEPROM
start in commit ad8f8687Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
parent e5648aca
......@@ -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
......
......@@ -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 */
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -179,7 +179,7 @@
#endif
/* #define CFG_ID_EEPROM 1
/* #define CONFIG_ID_EEPROM 1
#define ID_EEPROM_ADDR 0x57 */
/*
......
......@@ -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
......
......@@ -409,7 +409,7 @@ void board_init_f(ulong bootflag)
}
#endif
#ifdef CFG_ID_EEPROM
#ifdef CONFIG_ID_EEPROM
mac_read_from_eeprom();
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment