From 2e3c10eea0b7f31bc608cc1fc2f24db9d346dee2 Mon Sep 17 00:00:00 2001
From: Michal Simek <michal.simek@amd.com>
Date: Wed, 23 Nov 2022 09:27:08 +0100
Subject: [PATCH] xilinx: Remove unused
ZYNQ_MAC_IN_EEPROM/ZYNQ_GEM_I2C_MAC_OFFSET entries
The commit ba74bcf3e07b ("xilinx: common: Remove
zynq_board_read_rom_ethaddr()") removed zynq_board_read_rom_ethaddr()
because xlnx,eeprom link via DT chosen node is no longer used. But forget
to remove Kconfig entries which are used by this code only.
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/f97451ed33409838efea4071553b6da795cfc578.1669192026.git.michal.simek@amd.com
---
board/xilinx/Kconfig | 17 -----------------
...azedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 2 --
configs/syzygy_hub_defconfig | 2 --
configs/xilinx_zynqmp_virt_defconfig | 2 --
4 files changed, 23 deletions(-)
diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig
index 7b31d7eaed..4f0776e8bd 100644
--- a/board/xilinx/Kconfig
+++ b/board/xilinx/Kconfig
@@ -58,23 +58,6 @@ config BOOT_SCRIPT_OFFSET
help
Specifies distro boot script offset in NAND/QSPI/NOR flash.
-config ZYNQ_MAC_IN_EEPROM
- bool "Reading MAC address from EEPROM"
- help
- Enable this option if your MAC address is saved in eeprom and
- xlnx,eeprom DT property in chosen node points to it.
-
-if ZYNQ_MAC_IN_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.
-
-endif
-
config CMD_FRU
bool "FRU information for product"
help
diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
index 943b4da21d..ce07f1633e 100644
--- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
+++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
@@ -8,8 +8,6 @@ CONFIG_DEFAULT_DEVICE_TREE="avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0"
CONFIG_SPL=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_ZYNQ_MAC_IN_EEPROM=y
-CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xfa
CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_DEBUG_UART=y
diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
index acce95ec02..179cb52212 100644
--- a/configs/syzygy_hub_defconfig
+++ b/configs/syzygy_hub_defconfig
@@ -9,8 +9,6 @@ CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-syzygy-hub"
CONFIG_SPL_STACK_R_ADDR=0x200000
CONFIG_SPL=y
-CONFIG_ZYNQ_MAC_IN_EEPROM=y
-CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
CONFIG_SYS_LOAD_ADDR=0x0
CONFIG_DEBUG_UART=y
CONFIG_DISTRO_DEFAULTS=y
diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
index 9696e418da..4732c39bdb 100644
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -13,8 +13,6 @@ CONFIG_SPL=y
CONFIG_ENV_OFFSET_REDUND=0x1E80000
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
-CONFIG_ZYNQ_MAC_IN_EEPROM=y
-CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
CONFIG_CMD_FRU=y
CONFIG_ZYNQMP_USB=y
CONFIG_SYS_LOAD_ADDR=0x8000000
--
2.39.5