On 22.2.2018 13:45, Vipul Kumar wrote:
This patch added Kconfig support for ZYNQ_EEPROM and enabled it in respective defconfig.
Signed-off-by: Vipul Kumar vipulk@xilinx.com Signed-off-by: Siva Durga Prasad Paladugu sivadur@xilinx.com
configs/xilinx_zynqmp_ep_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + drivers/misc/Kconfig | 5 +++++ include/configs/xilinx_zynqmp_ep.h | 1 - include/configs/zynq_zc70x.h | 1 - 6 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 7f8e774..2b8be89 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -58,6 +58,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_CADENCE=y CONFIG_MISC=y +CONFIG_ZYNQ_EEPROM=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 878bc79..e0a41c0 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -40,6 +40,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_DM_GPIO=y +CONFIG_ZYNQ_EEPROM=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 7b2e072..c869316 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -40,6 +40,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_DM_GPIO=y +CONFIG_ZYNQ_EEPROM=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index f1c15cb..eef7df3 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -214,6 +214,11 @@ 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
- bool "Enable driver for ZYNQ EEPROM"
- help
This enables the EEPROM driver for Zynq.if I2C_EEPROM
config SYS_I2C_EEPROM_ADDR diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h index 3a572b7..6c48e15 100644 --- a/include/configs/xilinx_zynqmp_ep.h +++ b/include/configs/xilinx_zynqmp_ep.h @@ -15,7 +15,6 @@
#define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #define CONFIG_ZYNQ_SDHCI_MIN_FREQ (CONFIG_ZYNQ_SDHCI_MAX_FREQ >> 9) -#define CONFIG_ZYNQ_EEPROM #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \ ZYNQMP_USB1_XHCI_BASEADDR}
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h index fc46fec..88a7abd 100644 --- a/include/configs/zynq_zc70x.h +++ b/include/configs/zynq_zc70x.h @@ -11,7 +11,6 @@ #define __CONFIG_ZYNQ_ZC70X_H
#define CONFIG_ZYNQ_I2C0 -#define CONFIG_ZYNQ_EEPROM
#include <configs/zynq-common.h>
This symbol just enables some config options which were already moved to Kconfig.
125 /* EEPROM */ 126 #ifdef CONFIG_ZYNQ_EEPROM 127 # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 128 # define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 129 # define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 130 # define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 131 # define CONFIG_SYS_EEPROM_SIZE 1024 /* Bytes */ 132 #endif
It means setup that macros via Kconfig and get rid of this symbol completely. Also there is no setting for zynqmp at all it means all zynqmp setting should be removed.
M