summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-zynq/include/mach/sys_proto.h2
-rw-r--r--arch/arm/mach-zynqmp/include/mach/sys_proto.h1
-rw-r--r--board/xilinx/common/board.c28
-rw-r--r--drivers/net/zynq_gem.c16
4 files changed, 0 insertions, 47 deletions
diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h
index 1dc16d479e..268ec50ad8 100644
--- a/arch/arm/mach-zynq/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynq/include/mach/sys_proto.h
@@ -17,6 +17,4 @@ extern int zynq_slcr_get_mio_pin_status(const char *periph);
extern void zynq_ddrc_init(void);
extern unsigned int zynq_get_silicon_version(void);
-int zynq_board_read_rom_ethaddr(unsigned char *ethaddr);
-
#endif /* _SYS_PROTO_H_ */
diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
index 9fffb4e541..c6733ed1bb 100644
--- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
@@ -46,7 +46,6 @@ enum {
TCM_SPLIT,
};
-int zynq_board_read_rom_ethaddr(unsigned char *ethaddr);
unsigned int zynqmp_get_silicon_version(void);
int zynqmp_mmio_write(const u32 address, const u32 mask, const u32 value);
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 99fdbac639..59d87f2352 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -54,34 +54,6 @@ struct efi_capsule_update_info update_info = {
u8 num_image_type_guids = ARRAY_SIZE(fw_images);
#endif /* EFI_HAVE_CAPSULE_SUPPORT */
-#if defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET)
-int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
-{
- int ret = -EINVAL;
- struct udevice *dev;
- ofnode eeprom;
-
- eeprom = ofnode_get_chosen_node("xlnx,eeprom");
- if (!ofnode_valid(eeprom))
- return -ENODEV;
-
- debug("%s: Path to EEPROM %s\n", __func__,
- ofnode_read_chosen_string("xlnx,eeprom"));
-
- ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, &dev);
- if (ret)
- return ret;
-
- ret = dm_i2c_read(dev, CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET, ethaddr, 6);
- if (ret)
- debug("%s: I2C EEPROM MAC address read failed\n", __func__);
- else
- debug("%s: I2C EEPROM MAC %pM\n", __func__, ethaddr);
-
- return ret;
-}
-#endif
-
#define EEPROM_HEADER_MAGIC 0xdaaddeed
#define EEPROM_HDR_MANUFACTURER_LEN 16
#define EEPROM_HDR_NAME_LEN 16
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 3f4357ec80..507b19b759 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -662,21 +662,6 @@ static void zynq_gem_halt(struct udevice *dev)
ZYNQ_GEM_NWCTRL_TXEN_MASK, 0);
}
-__weak int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
-{
- return -ENOSYS;
-}
-
-static int zynq_gem_read_rom_mac(struct udevice *dev)
-{
- struct eth_pdata *pdata = dev_get_plat(dev);
-
- if (!pdata)
- return -ENOSYS;
-
- return zynq_board_read_rom_ethaddr(pdata->enetaddr);
-}
-
static int zynq_gem_miiphy_read(struct mii_dev *bus, int addr,
int devad, int reg)
{
@@ -884,7 +869,6 @@ static const struct eth_ops zynq_gem_ops = {
.free_pkt = zynq_gem_free_pkt,
.stop = zynq_gem_halt,
.write_hwaddr = zynq_gem_setup_mac,
- .read_rom_hwaddr = zynq_gem_read_rom_mac,
};
static int zynq_gem_of_to_plat(struct udevice *dev)