From: Michal Simek Date: Tue, 16 Jan 2018 13:38:35 +0000 (+0100) Subject: arm64: zynqmp: Enable i2c via Kconfig X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37283d88fa37bd8fb48adf91f3899a2b51484435;p=thirdparty%2Fu-boot.git arm64: zynqmp: Enable i2c via Kconfig Simplify board configurations. Signed-off-by: Michal Simek --- diff --git a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig index e05ab81f2ea..8ad81d32016 100644 --- a/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm017 dc3" CONFIG_ZYNQMP_USB=y +CONFIG_ZYNQ_I2C0=y +CONFIG_ZYNQ_I2C1=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm017-dc3" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig index ab550538aef..1c2a936c821 100644 --- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig @@ -9,6 +9,8 @@ CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102 rev1.0" CONFIG_ZYNQMP_QSPI=y CONFIG_ZYNQMP_USB=y CONFIG_SPI_GENERIC=y +CONFIG_ZYNQ_I2C0=y +CONFIG_ZYNQ_I2C1=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig index 97d7d0d2005..4683b4c9315 100644 --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -9,6 +9,8 @@ CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102 revA" CONFIG_ZYNQMP_QSPI=y CONFIG_ZYNQMP_USB=y CONFIG_SPI_GENERIC=y +CONFIG_ZYNQ_I2C0=y +CONFIG_ZYNQ_I2C1=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revA" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 0dceb1a6b44..eb908264d39 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -9,6 +9,8 @@ CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102 revB" CONFIG_ZYNQMP_QSPI=y CONFIG_ZYNQMP_USB=y CONFIG_SPI_GENERIC=y +CONFIG_ZYNQ_I2C0=y +CONFIG_ZYNQ_I2C1=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revB" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/xilinx_zynqmp_zcu104_revA_defconfig b/configs/xilinx_zynqmp_zcu104_revA_defconfig index 349ce17b353..e890e9cb452 100644 --- a/configs/xilinx_zynqmp_zcu104_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu104_revA_defconfig @@ -7,6 +7,7 @@ CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU104 revA" CONFIG_ZYNQMP_QSPI=y CONFIG_ZYNQMP_USB=y CONFIG_SPI_GENERIC=y +CONFIG_ZYNQ_I2C1=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu104-revA" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/xilinx_zynqmp_zcu104_revC_defconfig b/configs/xilinx_zynqmp_zcu104_revC_defconfig index f9baa6bdbe8..6e51139d525 100644 --- a/configs/xilinx_zynqmp_zcu104_revC_defconfig +++ b/configs/xilinx_zynqmp_zcu104_revC_defconfig @@ -7,6 +7,7 @@ CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU104 revC" CONFIG_ZYNQMP_QSPI=y CONFIG_ZYNQMP_USB=y CONFIG_SPI_GENERIC=y +CONFIG_ZYNQ_I2C1=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu104-revC" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/xilinx_zynqmp_zcu106_revA_defconfig b/configs/xilinx_zynqmp_zcu106_revA_defconfig index 7dcf720325d..de1afbe301e 100644 --- a/configs/xilinx_zynqmp_zcu106_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu106_revA_defconfig @@ -9,6 +9,8 @@ CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU106 revA" CONFIG_ZYNQMP_QSPI=y CONFIG_ZYNQMP_USB=y CONFIG_SPI_GENERIC=y +CONFIG_ZYNQ_I2C0=y +CONFIG_ZYNQ_I2C1=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/configs/xilinx_zynqmp_zcu111_revA_defconfig b/configs/xilinx_zynqmp_zcu111_revA_defconfig index 946c18778b6..9e7be98ad9c 100644 --- a/configs/xilinx_zynqmp_zcu111_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu111_revA_defconfig @@ -7,6 +7,8 @@ CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU111" CONFIG_ZYNQMP_QSPI=y CONFIG_ZYNQMP_USB=y CONFIG_SPI_GENERIC=y +CONFIG_ZYNQ_I2C0=y +CONFIG_ZYNQ_I2C1=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu111-revA" CONFIG_DEBUG_UART=y CONFIG_AHCI=y diff --git a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h index 2be648b9415..b74bdf1b548 100644 --- a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h +++ b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h @@ -11,8 +11,6 @@ #define __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_ZYNQ_I2C0 -#define CONFIG_ZYNQ_I2C1 #include diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index d46f0812b31..3de44e5f498 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -11,8 +11,6 @@ #define __CONFIG_ZYNQMP_ZCU102_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_ZYNQ_I2C0 -#define CONFIG_ZYNQ_I2C1 #define CONFIG_SYS_I2C_MAX_HOPS 1 #define CONFIG_SYS_NUM_I2C_BUSES 18 #define CONFIG_SYS_I2C_BUSES { \ diff --git a/include/configs/xilinx_zynqmp_zcu104.h b/include/configs/xilinx_zynqmp_zcu104.h index 9cc0ec1a745..58f3c5c9cb4 100644 --- a/include/configs/xilinx_zynqmp_zcu104.h +++ b/include/configs/xilinx_zynqmp_zcu104.h @@ -11,7 +11,6 @@ #define __CONFIG_ZYNQMP_ZCU104_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_ZYNQ_I2C1 #define CONFIG_SYS_I2C_MAX_HOPS 1 #define CONFIG_SYS_NUM_I2C_BUSES 9 #define CONFIG_SYS_I2C_BUSES { \ diff --git a/include/configs/xilinx_zynqmp_zcu106.h b/include/configs/xilinx_zynqmp_zcu106.h index 95ae0927c3e..b8019d29d38 100644 --- a/include/configs/xilinx_zynqmp_zcu106.h +++ b/include/configs/xilinx_zynqmp_zcu106.h @@ -11,8 +11,6 @@ #define __CONFIG_ZYNQMP_ZCU106_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_ZYNQ_I2C0 -#define CONFIG_ZYNQ_I2C1 #define CONFIG_SYS_I2C_MAX_HOPS 1 #define CONFIG_SYS_NUM_I2C_BUSES 18 #define CONFIG_SYS_I2C_BUSES { \ diff --git a/include/configs/xilinx_zynqmp_zcu111.h b/include/configs/xilinx_zynqmp_zcu111.h index 73e091c8f53..ed32279d9f8 100644 --- a/include/configs/xilinx_zynqmp_zcu111.h +++ b/include/configs/xilinx_zynqmp_zcu111.h @@ -11,8 +11,6 @@ #define __CONFIG_ZYNQMP_ZCU111_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_ZYNQ_I2C0 -#define CONFIG_ZYNQ_I2C1 #define CONFIG_SYS_I2C_MAX_HOPS 1 #define CONFIG_SYS_NUM_I2C_BUSES 21 #define CONFIG_SYS_I2C_BUSES { \