From 027b1134b20b253b71de306738ed8d2d3f8ddc21 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 22 Jan 2019 15:55:46 +0100 Subject: [PATCH] xilinx: common: Remove !DM_i2C code for reading mac from eeprom All platforms are converted to DM_I2C that's why there is no reason to keep this code here. Signed-off-by: Michal Simek Reviewed-by: Heiko Schocher --- board/xilinx/common/board.c | 19 ------------------- configs/zynq_zybo_defconfig | 1 - drivers/misc/Kconfig | 1 + 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index b14f530c72..7e6340bad6 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -8,24 +8,6 @@ #include #include -#if !defined(CONFIG_DM_I2C) -int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) -{ -#if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR) && \ - defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET) && \ - defined(CONFIG_ZYNQ_EEPROM_BUS) - i2c_set_bus_num(CONFIG_ZYNQ_EEPROM_BUS); - - if (eeprom_read(CONFIG_ZYNQ_GEM_EEPROM_ADDR, - CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET, - ethaddr, 6)) - printf("I2C EEPROM MAC address read failed\n"); -#endif - - return 0; -} - -#else int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) { int ret = -EINVAL; @@ -54,4 +36,3 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) return ret; } -#endif diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index 72a578000c..9a4ac2dcc9 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -39,7 +39,6 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 704c8dd195..d6e677fba8 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -245,6 +245,7 @@ config SPL_I2C_EEPROM config ZYNQ_GEM_I2C_MAC_OFFSET hex "Set the I2C MAC offset" default 0x0 + depends on DM_I2C help Set the MAC offset for i2C. -- 2.39.5