From d13f92b7420a7383cefe33bb1ffc1ae56f0d2f1e Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 3 Jan 2019 13:58:27 +0100 Subject: ARM: zynq: Run distribution boot commands first This patch is doing two things. 1. Exchanging order of boot commands. distro_bootcmd is run first followed by Xilinx boot command. 2. Remove CONFIG_BOOTCOMMAND from configs (and follow mainline) by creating Xilinx distribution bootcommand and wiring it as the last bootcommand. QSPI, NAND distribution boot command will be added later. Signed-off-by: Michal Simek --- include/configs/zynq-common.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 1710feda918..6193d672686 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -153,11 +153,18 @@ #define BOOT_TARGET_DEVICES_DHCP(func) #endif +#define BOOTENV_DEV_XILINX(devtypeu, devtypel, instance) \ + "bootcmd_xilinx=run $modeboot\0" + +#define BOOTENV_DEV_NAME_XILINX(devtypeu, devtypel, instance) \ + "xilinx " + #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_PXE(func) \ - BOOT_TARGET_DEVICES_DHCP(func) + BOOT_TARGET_DEVICES_DHCP(func) \ + func(XILINX, xilinx, na) #include #endif /* CONFIG_SPL_BUILD */ -- cgit v1.2.3 From ad78d2641f03b08c7d7f18d5fe1c5acd19b828ec Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Thu, 24 Jan 2019 11:32:04 +0530 Subject: arm64: zynqmp: Define distro boot commnads for qspi and nand This patch adds distro boot commands for qspi and nand. The distro boot commands now reads the script from flash offset of 63.5MB and executes it. Setup default location via script_offset_f to 63.5MB to match the most xilinx reference boards. 512kB allocated space for script size (script_size_f) should be more than enough to cover custom boot logic. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'include') diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 7a9b06ec4c8..d83c1100b85 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -134,6 +134,8 @@ "kernel_addr_r=0x18000000\0" \ "scriptaddr=0x02000000\0" \ "ramdisk_addr_r=0x02100000\0" \ + "script_offset_f=0x3e80000\0" \ + "script_size_f=0x80000\0" \ #if defined(CONFIG_MMC_SDHCI_ZYNQ) # define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) @@ -165,8 +167,38 @@ # define BOOT_TARGET_DEVICES_DHCP(func) #endif +#if defined(CONFIG_ZYNQMP_GQSPI) +# define BOOT_TARGET_DEVICES_QSPI(func) func(QSPI, qspi, 0) +#else +# define BOOT_TARGET_DEVICES_QSPI(func) +#endif + +#if defined(CONFIG_NAND_ARASAN) +# define BOOT_TARGET_DEVICES_NAND(func) func(NAND, nand, 0) +#else +# define BOOT_TARGET_DEVICES_NAND(func) +#endif + +#define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=sf probe " #instance " 0 0 && " \ + "sf read $scriptaddr $script_offset_f $script_size_f && " \ + "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" + +#define BOOTENV_DEV_NAME_QSPI(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "= nand info && " \ + "nand read $scriptaddr $script_offset_f $script_size_f && " \ + "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" + +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ + #devtypel #instance " " + #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ + BOOT_TARGET_DEVICES_QSPI(func) \ + BOOT_TARGET_DEVICES_NAND(func) \ BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_SCSI(func) \ BOOT_TARGET_DEVICES_PXE(func) \ -- cgit v1.2.3 From 9755e3db8b1223699954146dfb171df75ec89ab3 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 21 Jan 2019 15:25:02 +0100 Subject: xilinx: Move zynq_board_read_rom_ethaddr to shared location Zynq and ZynqMP are sharing similar code and there is no reason to do code duplication. Move zynq_board_read_rom_ethaddr() to common file for easier conversion to DM. Use ZynqMP version that's why also add CONFIG_ZYNQ_EEPROM_BUS to Syzygy which is only one Zynq board which is using this feature. Signed-off-by: Michal Simek --- include/configs/syzygy_hub.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h index 88ee7728489..75036977d48 100644 --- a/include/configs/syzygy_hub.h +++ b/include/configs/syzygy_hub.h @@ -12,6 +12,7 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x57 +#define CONFIG_ZYNQ_EEPROM_BUS 0 #define CONFIG_EXTRA_ENV_SETTINGS \ "fit_image=fit.itb\0" \ -- cgit v1.2.3 From 0fbd2a822506a70da3b9ffb7216ea8d9ec776428 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Tue, 8 Jan 2019 21:47:29 +0530 Subject: arm64: versal: Add mini eMMC configuration This patch adds mini eMMC configuration which has only emmc0 and emmc1 functionalities and can run from small amount of memory. This is required for memory constraint devices. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- include/configs/xilinx_versal_mini.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 include/configs/xilinx_versal_mini.h (limited to 'include') diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h new file mode 100644 index 00000000000..c15fb5fc3b6 --- /dev/null +++ b/include/configs/xilinx_versal_mini.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Configuration for Xilinx Versal MINI configuration + * + * (C) Copyright 2018-2019 Xilinx, Inc. + * Michal Simek + * Siva Durga Prasad Paladugu + */ + +#ifndef __CONFIG_VERSAL_MINI_H +#define __CONFIG_VERSAL_MINI_H + +/* #define CONFIG_SYS_DCACHE_OFF */ +#define CONFIG_SYS_ICACHE_OFF + +#define CONFIG_SYS_MEMTEST_SCRATCH 0xfffc0000 + +#define CONFIG_EXTRA_ENV_SETTINGS + +#include + +/* Undef unneeded configs */ +#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CONFIG_ZLIB +#undef CONFIG_GZIP +#undef CONFIG_CMD_ENV +#undef CONFIG_BOOTM_NETBSD +#undef CONFIG_BOOTM_VXWORKS +#undef CONFIG_BOOTM_LINUX + +/* BOOTP options */ +#undef CONFIG_BOOTP_BOOTFILESIZE +#undef CONFIG_BOOTP_MAY_FAIL + +#endif /* __CONFIG_VERSAL_MINI_H */ -- cgit v1.2.3 From 90e97ab31e0208a3f8483872df212a1af8070897 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Fri, 25 Jan 2019 17:06:05 +0530 Subject: arm: zynq: Define distro boot commnads for qspi, nand and nor This patch adds distro boot commands for qspi, nand and nor. The distro boot commands now reads the script from flash offset of 15.75MB and executes it. Setup default location via script_offset_f to 15.75MB to match the most xilinx reference boards for qspi, nand and set the same using script_offset_nor to 0xE2EC0000 for nor. 256kB allocated space for script size (script_size_f) should be more than enough to cover custom boot logic. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- include/configs/zynq-common.h | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'include') diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 6193d672686..3d6dbf6ea82 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -153,14 +153,58 @@ #define BOOT_TARGET_DEVICES_DHCP(func) #endif +#if defined(CONFIG_ZYNQ_QSPI) +# define BOOT_TARGET_DEVICES_QSPI(func) func(QSPI, qspi, na) +#else +# define BOOT_TARGET_DEVICES_QSPI(func) +#endif + +#if defined(CONFIG_NAND_ZYNQ) +# define BOOT_TARGET_DEVICES_NAND(func) func(NAND, nand, na) +#else +# define BOOT_TARGET_DEVICES_NAND(func) +#endif + +#if defined(CONFIG_MTD_NOR_FLASH) +# define BOOT_TARGET_DEVICES_NOR(func) func(NOR, nor, na) +#else +# define BOOT_TARGET_DEVICES_NOR(func) +#endif + #define BOOTENV_DEV_XILINX(devtypeu, devtypel, instance) \ "bootcmd_xilinx=run $modeboot\0" #define BOOTENV_DEV_NAME_XILINX(devtypeu, devtypel, instance) \ "xilinx " +#define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \ + "bootcmd_qspi=sf probe 0 0 0 && " \ + "sf read $scriptaddr $script_offset_f $script_size_f && " \ + "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" + +#define BOOTENV_DEV_NAME_QSPI(devtypeu, devtypel, instance) \ + "qspi " + +#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ + "bootcmd_nand=nand info && " \ + "nand read $scriptaddr $script_offset_f $script_size_f && " \ + "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" + +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ + "nand " + +#define BOOTENV_DEV_NOR(devtypeu, devtypel, instance) \ + "bootcmd_nor=cp.b $scropt_offset_nor $scriptaddr $script_size_f && " \ + "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" + +#define BOOTENV_DEV_NAME_NOR(devtypeu, devtypel, instance) \ + "nor " + #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ + BOOT_TARGET_DEVICES_QSPI(func) \ + BOOT_TARGET_DEVICES_NAND(func) \ + BOOT_TARGET_DEVICES_NOR(func) \ BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_PXE(func) \ BOOT_TARGET_DEVICES_DHCP(func) \ @@ -179,6 +223,10 @@ "nor_flash_off=0xE2100000\0" \ "fdt_high=0x20000000\0" \ "initrd_high=0x20000000\0" \ + "scriptaddr=0x20000\0" \ + "script_offser_nor=0xE2FC0000\0" \ + "script_offset_f=0xFC0000\0" \ + "script_size_f=0x40000\0" \ "loadbootenv_addr=0x2000000\0" \ "fdt_addr_r=0x1f00000\0" \ "pxefile_addr_r=0x2000000\0" \ -- cgit v1.2.3 From a318b9392952d305a1e7db6e2d5f5da0cd0d7648 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Thu, 31 Jan 2019 17:28:13 +0530 Subject: arm64: versal: Define distro boot commnads for qspi ospi and mmc This patch adds distro boot commands for qspi, ospi and mmc. The distro boot commands now reads the script from flash offset of 63.5MB for qspi and ospi and executes it. For mmc its same as generic distro boot command. As either one of the qspi or ospi can exist on hardware, defined a single distroboot command as xspi that works for both. Setup default location via script_offset_f to 63.5MB to match the most xilinx reference boards for qspi, ospi for now. 512kB allocated space for script size (script_size_f) should be more than enough to cover custom boot logic. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- include/configs/xilinx_versal.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index bfe4c43449a..2cc36e793b6 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -73,9 +73,33 @@ "pxefile_addr_r=0x10000000\0" \ "kernel_addr_r=0x18000000\0" \ "scriptaddr=0x02000000\0" \ - "ramdisk_addr_r=0x02100000\0" + "ramdisk_addr_r=0x02100000\0" \ + "script_offset_f=0x3f80000\0" \ + "script_size_f=0x80000\0" + +#if defined(CONFIG_MMC_SDHCI_ZYNQ) +# define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) +#else +# define BOOT_TARGET_DEVICES_MMC(func) +#endif + +#if defined(CONFIG_ZYNQMP_GQSPI) || defined(CONFIG_CADENCE_OSPI_VERSAL) +# define BOOT_TARGET_DEVICES_XSPI(func) func(XSPI, xspi, 0) +#else +# define BOOT_TARGET_DEVICES_XSPI(func) +#endif + +#define BOOTENV_DEV_XSPI(devtypeu, devtypel, instance) \ + "bootcmd_xspi0=sf probe 0 0 0 && " \ + "sf read $scriptaddr $script_offset_f $script_size_f && " \ + "source ${scriptaddr}; echo SCRIPT FAILED: continuing...;\0" + +#define BOOTENV_DEV_NAME_XSPI(devtypeu, devtypel, instance) \ + "xspi " #define BOOT_TARGET_DEVICES(func) \ + BOOT_TARGET_DEVICES_MMC(func) \ + BOOT_TARGET_DEVICES_XSPI(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) -- cgit v1.2.3 From eebbfd865b27f5f20122d9d57f56aa03f6976c90 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Mon, 4 Feb 2019 16:18:29 +0530 Subject: arm64: versal: Add mini configuration for Versal This patch adds new mini target for versal. This configuration is very minimal in size which runs from OCM. It contains support for mtest which can be used for running DDR memory tests. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- include/configs/xilinx_versal_mini_qspi.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 include/configs/xilinx_versal_mini_qspi.h (limited to 'include') diff --git a/include/configs/xilinx_versal_mini_qspi.h b/include/configs/xilinx_versal_mini_qspi.h new file mode 100644 index 00000000000..8572b8b3d2d --- /dev/null +++ b/include/configs/xilinx_versal_mini_qspi.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Configuration for Xilinx Versal QSPI Flash utility + * + * (C) Copyright 2018-2019 Xilinx, Inc. + * Michal Simek + * Siva Durga Prasad Paladugu + */ + +#ifndef __CONFIG_VERSAL_MINI_QSPI_H +#define __CONFIG_VERSAL_MINI_QSPI_H + +#include + +#undef CONFIG_SYS_INIT_SP_ADDR +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0x20000) + +#endif /* __CONFIG_VERSAL_MINI_QSPI_H */ -- cgit v1.2.3 From aeac8921ab8c925a9ebd87bb59bba92fe03bdd03 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 22 Jan 2019 14:12:54 +0100 Subject: ARM: zynq: Convert Syzygy to DM_I2C Boards have only one controller enabled that's why move to DM_I2C is easy. Add also i2c alias for not to be shown as i2c bus -1 because alias doesn't exist. Config file points to MAC stored in eeprom but it is not listed that's why I have added 24c08 part. Signed-off-by: Michal Simek Reviewed-by: Heiko Schocher --- include/configs/syzygy_hub.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include') diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h index 75036977d48..e31b77c0c0b 100644 --- a/include/configs/syzygy_hub.h +++ b/include/configs/syzygy_hub.h @@ -10,10 +10,6 @@ #ifndef __CONFIG_SYZYGY_HUB_H #define __CONFIG_SYZYGY_HUB_H -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x57 -#define CONFIG_ZYNQ_EEPROM_BUS 0 - #define CONFIG_EXTRA_ENV_SETTINGS \ "fit_image=fit.itb\0" \ "bitstream_image=download.bit\0" \ -- cgit v1.2.3 From 217bb295e2bc18c0a4904b762abbda53ecd1a372 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 22 Jan 2019 14:43:04 +0100 Subject: ARM: zynq: Convert dlc20 and zc70x board to DM_I2C All these board have also eeprom enabled that's why it is also enabled via defconfig. There is also no need to have zc70x specific config file that's why also remove it. Signed-off-by: Michal Simek Reviewed-by: Heiko Schocher --- include/configs/zynq-common.h | 14 -------------- include/configs/zynq_zc70x.h | 16 ---------------- 2 files changed, 30 deletions(-) delete mode 100644 include/configs/zynq_zc70x.h (limited to 'include') diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 3d6dbf6ea82..a285fcdece7 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -102,20 +102,6 @@ # define DFU_ALT_INFO #endif -/* I2C */ -#if defined(CONFIG_SYS_I2C_ZYNQ) -# define CONFIG_SYS_I2C -#endif - -/* EEPROM */ -#ifdef CONFIG_ZYNQ_EEPROM -# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -# define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 -# define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 -# define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 -# define CONFIG_SYS_EEPROM_SIZE 1024 /* Bytes */ -#endif - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h deleted file mode 100644 index b5a28dab878..00000000000 --- a/include/configs/zynq_zc70x.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2013 Xilinx, Inc. - * - * Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards - * See zynq-common.h for Zynq common configs - */ - -#ifndef __CONFIG_ZYNQ_ZC70X_H -#define __CONFIG_ZYNQ_ZC70X_H - -#define CONFIG_ZYNQ_EEPROM - -#include - -#endif /* __CONFIG_ZYNQ_ZC70X_H */ -- cgit v1.2.3 From 8bdad43333cb71d65929a9f7d19f323c76364b67 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 18 Jan 2019 09:10:39 +0100 Subject: arm64: zynqmp: Switch all platforms to DM_I2C CONFIG_PCA953X is not needed because of PCA953X is integrated in gpio subsystem already. That's why also remove CMD_PCA953X which is only for this driver. zcu102/zcu104-revC/zcu106/zcu111 contain links to eeprom which stores MAC address. DM_I2C is not enabled for the whole SoC because it increase size for mini configurations and there is no I2C symbol present to setup dependencies. Signed-off-by: Michal Simek Reviewed-by: Heiko Schocher --- include/configs/xilinx_zynqmp.h | 5 ----- include/configs/xilinx_zynqmp_zcu100.h | 15 -------------- include/configs/xilinx_zynqmp_zcu102.h | 29 --------------------------- include/configs/xilinx_zynqmp_zcu104.h | 17 ---------------- include/configs/xilinx_zynqmp_zcu104_revC.h | 3 --- include/configs/xilinx_zynqmp_zcu106.h | 28 -------------------------- include/configs/xilinx_zynqmp_zcu111.h | 31 ----------------------------- 7 files changed, 128 deletions(-) (limited to 'include') diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index d83c1100b85..27a8e4d4906 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -108,11 +108,6 @@ # define PHY_ANEG_TIMEOUT 20000 #endif -/* I2C */ -#if defined(CONFIG_SYS_I2C_ZYNQ) -# define CONFIG_SYS_I2C -#endif - /* EEPROM */ #ifdef CONFIG_ZYNQMP_EEPROM # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/xilinx_zynqmp_zcu100.h b/include/configs/xilinx_zynqmp_zcu100.h index 5ad9e1be5af..409dcb2651d 100644 --- a/include/configs/xilinx_zynqmp_zcu100.h +++ b/include/configs/xilinx_zynqmp_zcu100.h @@ -9,21 +9,6 @@ #ifndef __CONFIG_ZYNQMP_ZCU100_H #define __CONFIG_ZYNQMP_ZCU100_H -/* FIXME Will go away soon */ -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 9 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 0} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 1} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 2} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 3} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 4} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 5} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 6} } }, \ - {0, {{I2C_MUX_PCA9548, 0x75, 7} } }, \ - } - #include #endif /* __CONFIG_ZYNQMP_ZCU100_H */ diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index ad6bc3d1bf1..f1504784fdd 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -10,35 +10,6 @@ #define __CONFIG_ZYNQMP_ZCU102_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 18 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \ - {1, {I2C_NULL_HOP} }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \ - } - -#define CONFIG_PCA953X - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_EEPROM_BUS 5 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 - #define CONFIG_SPD_EEPROM #define CONFIG_DDR_SPD diff --git a/include/configs/xilinx_zynqmp_zcu104.h b/include/configs/xilinx_zynqmp_zcu104.h index 7e3b9ad7058..9d40955d5d3 100644 --- a/include/configs/xilinx_zynqmp_zcu104.h +++ b/include/configs/xilinx_zynqmp_zcu104.h @@ -10,23 +10,6 @@ #define __CONFIG_ZYNQMP_ZCU104_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 9 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 0} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 1} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 2} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 3} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 4} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 5} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 6} } }, \ - {0, {{I2C_MUX_PCA9548, 0x74, 7} } }, \ - } - -#define CONFIG_PCA953X - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #include diff --git a/include/configs/xilinx_zynqmp_zcu104_revC.h b/include/configs/xilinx_zynqmp_zcu104_revC.h index 8b3ae36d0f3..e3059a921e6 100644 --- a/include/configs/xilinx_zynqmp_zcu104_revC.h +++ b/include/configs/xilinx_zynqmp_zcu104_revC.h @@ -11,7 +11,4 @@ #include -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 -#define CONFIG_ZYNQ_EEPROM_BUS 1 - #endif /* __CONFIG_ZYNQMP_ZCU104_REVC_H */ diff --git a/include/configs/xilinx_zynqmp_zcu106.h b/include/configs/xilinx_zynqmp_zcu106.h index cc2d145ddd9..dc2efc7e059 100644 --- a/include/configs/xilinx_zynqmp_zcu106.h +++ b/include/configs/xilinx_zynqmp_zcu106.h @@ -10,34 +10,6 @@ #define __CONFIG_ZYNQMP_ZCU106_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 18 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \ - {1, {I2C_NULL_HOP} }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \ - } - -#define CONFIG_PCA953X - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_EEPROM_BUS 5 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 #include diff --git a/include/configs/xilinx_zynqmp_zcu111.h b/include/configs/xilinx_zynqmp_zcu111.h index 8f8cb4f0870..dea5e4a4d41 100644 --- a/include/configs/xilinx_zynqmp_zcu111.h +++ b/include/configs/xilinx_zynqmp_zcu111.h @@ -10,37 +10,6 @@ #define __CONFIG_ZYNQMP_ZCU111_H #define CONFIG_ZYNQ_SDHCI1 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_NUM_I2C_BUSES 21 -#define CONFIG_SYS_I2C_BUSES { \ - {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 0} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 1} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 2} } }, \ - {0, {{I2C_MUX_PCA9544, 0x75, 3} } }, \ - {1, {I2C_NULL_HOP} }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 5} } }, \ - {1, {{I2C_MUX_PCA9548, 0x74, 6} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 0} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 1} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 2} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 3} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 4} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 5} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 6} } }, \ - {1, {{I2C_MUX_PCA9548, 0x75, 7} } }, \ - } - -#define CONFIG_PCA953X - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_EEPROM_BUS 5 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 #include -- cgit v1.2.3 From 35e2b92344b1feee818a8e778b403c8a6a136230 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 13 Feb 2019 13:46:41 +0100 Subject: arm64: zynqmp: Fix logic around CONFIG_ZYNQ_SDHCI Replace SDHCI controller listing by Kconfig symbol to let SPL know that this board is using multiple SDHCIs controllers. Kconfig help message should explain why this is needed. Origin symbols were used in full u-boot but with moving to distro boot this was fixed already. Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp_zc1275_revB.h | 2 -- include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h | 3 --- include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h | 2 -- include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h | 2 -- include/configs/xilinx_zynqmp_zcu102.h | 1 - include/configs/xilinx_zynqmp_zcu104.h | 2 -- include/configs/xilinx_zynqmp_zcu106.h | 2 -- include/configs/xilinx_zynqmp_zcu111.h | 2 -- 8 files changed, 16 deletions(-) (limited to 'include') diff --git a/include/configs/xilinx_zynqmp_zc1275_revB.h b/include/configs/xilinx_zynqmp_zc1275_revB.h index f0880db0b05..244f61edd18 100644 --- a/include/configs/xilinx_zynqmp_zc1275_revB.h +++ b/include/configs/xilinx_zynqmp_zc1275_revB.h @@ -8,8 +8,6 @@ #ifndef __CONFIG_ZYNQMP_ZC1275_REVB_H #define __CONFIG_ZYNQMP_ZC1275_REVB_H -#define CONFIG_ZYNQ_SDHCI1 - #include #endif /* __CONFIG_ZYNQMP_ZC1275_REVB_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h index f0ab3f15922..cd72e6f419b 100644 --- a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h +++ b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h @@ -9,9 +9,6 @@ #ifndef __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H #define __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H -#define CONFIG_ZYNQ_SDHCI0 -#define CONFIG_ZYNQ_SDHCI1 - #include #endif /* __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h index bd4a0c3178b..dbacfde151d 100644 --- a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h +++ b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H #define __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H -#define CONFIG_ZYNQ_SDHCI1 - #include #endif /* __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h index f39eeb9bfc9..0b525c88b7d 100644 --- a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h +++ b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H #define __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H -#define CONFIG_ZYNQ_SDHCI0 - #include #endif /* __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H */ diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index f1504784fdd..dfa1f7a0a9b 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -9,7 +9,6 @@ #ifndef __CONFIG_ZYNQMP_ZCU102_H #define __CONFIG_ZYNQMP_ZCU102_H -#define CONFIG_ZYNQ_SDHCI1 #define CONFIG_SPD_EEPROM #define CONFIG_DDR_SPD diff --git a/include/configs/xilinx_zynqmp_zcu104.h b/include/configs/xilinx_zynqmp_zcu104.h index 9d40955d5d3..a8303756e5e 100644 --- a/include/configs/xilinx_zynqmp_zcu104.h +++ b/include/configs/xilinx_zynqmp_zcu104.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_ZYNQMP_ZCU104_H #define __CONFIG_ZYNQMP_ZCU104_H -#define CONFIG_ZYNQ_SDHCI1 - #include #endif /* __CONFIG_ZYNQMP_ZCU104_H */ diff --git a/include/configs/xilinx_zynqmp_zcu106.h b/include/configs/xilinx_zynqmp_zcu106.h index dc2efc7e059..bb5cf677cb7 100644 --- a/include/configs/xilinx_zynqmp_zcu106.h +++ b/include/configs/xilinx_zynqmp_zcu106.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_ZYNQMP_ZCU106_H #define __CONFIG_ZYNQMP_ZCU106_H -#define CONFIG_ZYNQ_SDHCI1 - #include #endif /* __CONFIG_ZYNQMP_ZCU106_H */ diff --git a/include/configs/xilinx_zynqmp_zcu111.h b/include/configs/xilinx_zynqmp_zcu111.h index dea5e4a4d41..507aee9332c 100644 --- a/include/configs/xilinx_zynqmp_zcu111.h +++ b/include/configs/xilinx_zynqmp_zcu111.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_ZYNQMP_ZCU111_H #define __CONFIG_ZYNQMP_ZCU111_H -#define CONFIG_ZYNQ_SDHCI1 - #include #endif /* __CONFIG_ZYNQMP_ZCU111_H */ -- cgit v1.2.3 From f6b71d830f96e36efde398eb79cae0a1bb495c0f Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 13 Feb 2019 14:00:06 +0100 Subject: arm64: zynqmp: Remove SPD related configurations SPD autodetection hasn't been enabled that's why there is zero size difference if that options are enabled/disabled. Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp_zcu102.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index dfa1f7a0a9b..9ebf0b5ed79 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -9,9 +9,6 @@ #ifndef __CONFIG_ZYNQMP_ZCU102_H #define __CONFIG_ZYNQMP_ZCU102_H -#define CONFIG_SPD_EEPROM -#define CONFIG_DDR_SPD - #include #endif /* __CONFIG_ZYNQMP_ZCU102_H */ -- cgit v1.2.3 From 06efd3e53c2bd87d6c4c6fd5b3f7edc12684161b Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 13 Feb 2019 13:33:32 +0100 Subject: arm64: zynqmp: Remove board config files All options have been moved to Kconfig and there is no need to have board header files. Mini configurations require them that's why they are still there. Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp_zc1275_revB.h | 13 ------------- include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h | 14 -------------- include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h | 14 -------------- include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h | 15 --------------- include/configs/xilinx_zynqmp_zcu100.h | 14 -------------- include/configs/xilinx_zynqmp_zcu102.h | 14 -------------- include/configs/xilinx_zynqmp_zcu104.h | 14 -------------- include/configs/xilinx_zynqmp_zcu104_revC.h | 14 -------------- include/configs/xilinx_zynqmp_zcu106.h | 14 -------------- include/configs/xilinx_zynqmp_zcu111.h | 14 -------------- 10 files changed, 140 deletions(-) delete mode 100644 include/configs/xilinx_zynqmp_zc1275_revB.h delete mode 100644 include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h delete mode 100644 include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h delete mode 100644 include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h delete mode 100644 include/configs/xilinx_zynqmp_zcu100.h delete mode 100644 include/configs/xilinx_zynqmp_zcu102.h delete mode 100644 include/configs/xilinx_zynqmp_zcu104.h delete mode 100644 include/configs/xilinx_zynqmp_zcu104_revC.h delete mode 100644 include/configs/xilinx_zynqmp_zcu106.h delete mode 100644 include/configs/xilinx_zynqmp_zcu111.h (limited to 'include') diff --git a/include/configs/xilinx_zynqmp_zc1275_revB.h b/include/configs/xilinx_zynqmp_zc1275_revB.h deleted file mode 100644 index 244f61edd18..00000000000 --- a/include/configs/xilinx_zynqmp_zc1275_revB.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zc1275 RevB - * - * (C) Copyright 2018 Xilinx, Inc. - */ - -#ifndef __CONFIG_ZYNQMP_ZC1275_REVB_H -#define __CONFIG_ZYNQMP_ZC1275_REVB_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZC1275_REVB_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h deleted file mode 100644 index cd72e6f419b..00000000000 --- a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zc1751 XM015 DC1 - * - * (C) Copyright 2015 Xilinx, Inc. - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H -#define __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h deleted file mode 100644 index dbacfde151d..00000000000 --- a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zc1751 XM017 DC3 - * - * (C) Copyright 2015 Xilinx, Inc. - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H -#define __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H */ diff --git a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h deleted file mode 100644 index 0b525c88b7d..00000000000 --- a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zc1751 XM019 DC5 - * - * (C) Copyright 2015 Xilinx, Inc. - * Siva Durga Prasad - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H -#define __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H */ diff --git a/include/configs/xilinx_zynqmp_zcu100.h b/include/configs/xilinx_zynqmp_zcu100.h deleted file mode 100644 index 409dcb2651d..00000000000 --- a/include/configs/xilinx_zynqmp_zcu100.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zcu100 - * - * (C) Copyright 2015 - 2016 Xilinx, Inc. - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZCU100_H -#define __CONFIG_ZYNQMP_ZCU100_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZCU100_H */ diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h deleted file mode 100644 index 9ebf0b5ed79..00000000000 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zcu102 - * - * (C) Copyright 2015 Xilinx, Inc. - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZCU102_H -#define __CONFIG_ZYNQMP_ZCU102_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZCU102_H */ diff --git a/include/configs/xilinx_zynqmp_zcu104.h b/include/configs/xilinx_zynqmp_zcu104.h deleted file mode 100644 index a8303756e5e..00000000000 --- a/include/configs/xilinx_zynqmp_zcu104.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zcu104 - * - * (C) Copyright 2017 Xilinx, Inc. - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZCU104_H -#define __CONFIG_ZYNQMP_ZCU104_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZCU104_H */ diff --git a/include/configs/xilinx_zynqmp_zcu104_revC.h b/include/configs/xilinx_zynqmp_zcu104_revC.h deleted file mode 100644 index e3059a921e6..00000000000 --- a/include/configs/xilinx_zynqmp_zcu104_revC.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zcu104 - * - * (C) Copyright 2018 Xilinx, Inc. - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZCU104_REVC_H -#define __CONFIG_ZYNQMP_ZCU104_REVC_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZCU104_REVC_H */ diff --git a/include/configs/xilinx_zynqmp_zcu106.h b/include/configs/xilinx_zynqmp_zcu106.h deleted file mode 100644 index bb5cf677cb7..00000000000 --- a/include/configs/xilinx_zynqmp_zcu106.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zcu106 - * - * (C) Copyright 2016 Xilinx, Inc. - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZCU106_H -#define __CONFIG_ZYNQMP_ZCU106_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZCU106_H */ diff --git a/include/configs/xilinx_zynqmp_zcu111.h b/include/configs/xilinx_zynqmp_zcu111.h deleted file mode 100644 index 507aee9332c..00000000000 --- a/include/configs/xilinx_zynqmp_zcu111.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Configuration for Xilinx ZynqMP zcu111 - * - * (C) Copyright 2017 Xilinx, Inc. - * Michal Simek - */ - -#ifndef __CONFIG_ZYNQMP_ZCU111_H -#define __CONFIG_ZYNQMP_ZCU111_H - -#include - -#endif /* __CONFIG_ZYNQMP_ZCU111_H */ -- cgit v1.2.3