[U-Boot] [UBOOT PATCH v2 2/2] eeprom: Added Kconfig support for eeprom u-boot headers

[Vipul Kumar]

This patch added Kconfig support for CONFIG_ZYNQ_EEPROM_BUS
and CONFIG_ZYNQ_GEM_EEPROM_ADDR and enabled it in
respective defconfig.

Signed-off-by: Vipul Kumar <vipulk at xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
---
- Changes in V2:
- Added depends on ARCH_ZYNQ
- Branch: u-boot-microblaze/kconfig
---
 configs/syzygy_hub_defconfig                  |  1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig |  2 ++
 configs/xilinx_zynqmp_zcu102_revA_defconfig   |  2 ++
 configs/xilinx_zynqmp_zcu102_revB_defconfig   |  2 ++
 configs/zynq_zybo_defconfig                   |  1 +
 drivers/misc/Kconfig                          | 14 ++++++++++++++
 include/configs/syzygy_hub.h                  |  1 -
 include/configs/xilinx_zynqmp_zcu102.h        |  2 --
 include/configs/zynq_zybo.h                   |  1 -
 9 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
index 67d1f54..eda5a60 100644
--- a/configs/syzygy_hub_defconfig
+++ b/configs/syzygy_hub_defconfig
@@ -37,6 +37,7 @@ CONFIG_FPGA_ZYNQPL=y
 CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_ZYNQ_I2C1=y
+CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x57
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
index 1df5b0b..fe6b6c3 100644
--- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
@@ -57,6 +57,8 @@ CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_ZYNQ_I2C0=y
 CONFIG_ZYNQ_I2C1=y
 CONFIG_MISC=y
+CONFIG_ZYNQ_EEPROM_BUS=5
+CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x54
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
index c8a8362..3ee241d 100644
--- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
@@ -57,6 +57,8 @@ CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_ZYNQ_I2C0=y
 CONFIG_ZYNQ_I2C1=y
 CONFIG_MISC=y
+CONFIG_ZYNQ_EEPROM_BUS=5
+CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x54
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
index 8f85b5f..75ca1f0 100644
--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -57,6 +57,8 @@ CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_ZYNQ_I2C0=y
 CONFIG_ZYNQ_I2C1=y
 CONFIG_MISC=y
+CONFIG_ZYNQ_EEPROM_BUS=5
+CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x54
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 92f3e1e..4cb46b8 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -43,6 +43,7 @@ CONFIG_DM_GPIO=y
 CONFIG_SYS_I2C_ZYNQ=y
 CONFIG_ZYNQ_I2C0=y
 CONFIG_ZYNQ_I2C1=y
+CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x50
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index d774569..aa1089a 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -214,6 +214,20 @@ config SPL_I2C_EEPROM
          This option is an SPL-variant of the I2C_EEPROM option.
          See the help of I2C_EEPROM for details.

+config ZYNQ_EEPROM_BUS
+       int "Define the EEPROM bus number"
+       depends on ARCH_ZYNQMP || ARCH_ZYNQ
+       default -1
+       help
+         Define the EEPROM bus number.
+
+config ZYNQ_GEM_EEPROM_ADDR
+       hex "Define GEM EEPROM address"
+       depends on ARCH_ZYNQMP || ARCH_ZYNQ
+       default 0x0
+       help
+         Define the EEPROM address for GEM.
+
 config ZYNQ_GEM_I2C_MAC_OFFSET
        hex "Set the I2C MAC offset"
        default 0x0
diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h
index 73c9189..362a6c9 100644
--- a/include/configs/syzygy_hub.h
+++ b/include/configs/syzygy_hub.h
@@ -12,7 +12,6 @@
 #define __CONFIG_SYZYGY_HUB_H

 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x57

 #define CONFIG_EXTRA_ENV_SETTINGS       \
        "fit_image=fit.itb\0"           \
diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
index 27d9d6a..1166343 100644
--- a/include/configs/xilinx_zynqmp_zcu102.h
+++ b/include/configs/xilinx_zynqmp_zcu102.h
@@ -39,8 +39,6 @@
 #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}

 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_EEPROM_BUS         5
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x54

 #include <configs/xilinx_zynqmp.h>

diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 8f4e088..aca867c 100644
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -12,7 +12,6 @@
 #define __CONFIG_ZYNQ_ZYBO_H

 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
-#define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x50
 #define CONFIG_DISPLAY
 #define CONFIG_I2C_EDID

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.