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

[Michal Simek]

On 22.2.2018 13:45, Vipul Kumar wrote:
> 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>
> ---
>  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                          | 13 +++++++++++++
>  include/configs/syzygy_hub.h                  |  1 -
>  include/configs/xilinx_zynqmp_zcu102.h        |  2 --
>  include/configs/zynq_zybo.h                   |  1 -
>  9 files changed, 21 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
> index 996ecdb..d97ee8a 100644
> --- a/configs/syzygy_hub_defconfig
> +++ b/configs/syzygy_hub_defconfig
> @@ -34,6 +34,7 @@ CONFIG_OF_EMBED=y
>  CONFIG_SPL_DM_SEQ_ALIAS=y
>  CONFIG_FPGA_XILINX=y
>  CONFIG_DM_GPIO=y
> +CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x57
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
>  CONFIG_PHY_MARVELL=y
> diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> index d0a1467..9c34eea 100644
> --- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> @@ -54,6 +54,8 @@ CONFIG_FPGA_ZYNQMPPL=y
>  CONFIG_DM_GPIO=y
>  CONFIG_CMD_PCA953X=y
>  CONFIG_MISC=y
> +CONFIG_ZYNQ_EEPROM_BUS=5
> +CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x54
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
> diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> index ecefb00..de3cff6 100644
> --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> @@ -54,6 +54,8 @@ CONFIG_FPGA_ZYNQMPPL=y
>  CONFIG_DM_GPIO=y
>  CONFIG_CMD_PCA953X=y
>  CONFIG_MISC=y
> +CONFIG_ZYNQ_EEPROM_BUS=5
> +CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x54
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
> diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> index c2add99..04eb5c7 100644
> --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> @@ -54,6 +54,8 @@ CONFIG_FPGA_ZYNQMPPL=y
>  CONFIG_DM_GPIO=y
>  CONFIG_CMD_PCA953X=y
>  CONFIG_MISC=y
> +CONFIG_ZYNQ_EEPROM_BUS=5
> +CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x54
>  CONFIG_DM_MMC=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> index 138b249..73b776c 100644
> --- a/configs/zynq_zybo_defconfig
> +++ b/configs/zynq_zybo_defconfig
> @@ -39,6 +39,7 @@ CONFIG_DFU_MMC=y
>  CONFIG_DFU_RAM=y
>  CONFIG_FPGA_XILINX=y
>  CONFIG_DM_GPIO=y
> +CONFIG_ZYNQ_GEM_EEPROM_ADDR=0x50
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
>  CONFIG_SPI_FLASH=y
> diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
> index eef7df3..a793ed7 100644
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@ -219,6 +219,19 @@ config ZYNQ_EEPROM
>  	help
>  	  This enables the EEPROM driver for Zynq.
>  
> +config ZYNQ_EEPROM_BUS
> +	int "Define the EEPROM bus number"
> +	depends on ARCH_ZYNQMP

Please add here || ARCH_ZYNQ


> +	default -1
> +	help
> +	  Define the EEPROM bus number.
> +
> +config ZYNQ_GEM_EEPROM_ADDR
> +	hex "Define GEM EEPROM address"

Add dependency on ZYNQ and ZYNQMP here.
None is will use these two options.

M

> +	default 0x0
> +	help
> +	  Define the EEPROM address for GEM.
> +
>  if I2C_EEPROM
>  
>  config SYS_I2C_EEPROM_ADDR
> diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h
> index 4147b45..b33de1c 100644
> --- a/include/configs/syzygy_hub.h
> +++ b/include/configs/syzygy_hub.h
> @@ -13,7 +13,6 @@
>  
>  #define CONFIG_ZYNQ_I2C1
>  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
> -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR    0x57
>  #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0xFA
>  
>  #define CONFIG_EXTRA_ENV_SETTINGS       \
> diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
> index 85f78ba..b738f3b 100644
> --- a/include/configs/xilinx_zynqmp_zcu102.h
> +++ b/include/configs/xilinx_zynqmp_zcu102.h
> @@ -42,8 +42,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
>  #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET	0x20
>  
>  #include <configs/xilinx_zynqmp.h>
> diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
> index 808967c..d2abd9e 100644
> --- a/include/configs/zynq_zybo.h
> +++ b/include/configs/zynq_zybo.h
> @@ -14,7 +14,6 @@
>  #define CONFIG_ZYNQ_I2C0
>  #define CONFIG_ZYNQ_I2C1
>  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	1
> -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR	0x50
>  #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET	0xFA
>  #define CONFIG_DISPLAY
>  #define CONFIG_I2C_EDID
>