Skip to contentSkip to conversation

arm64: zynqmp: Cleanup defconfigs

PATCH New Michal Simek 3 participants 9 messages Dec 9, 2019 – Jan 16, 2020 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

cover arm64: zynqmp: Cleanup defconfigs

Hi,

over years a lot of new Xilinx ZynqMP board have been added to U-Boot with corresponding defconfigs. Also a lot of drivers have been moved to DM that we can make one generic configuration with one defconfig.
Nand still needs to be validated that's why dc2/dc3 are not moved yet.

Boards can be build like this:
export DEVICE_TREE="avnet-ultra96-rev1"
make xilinx_zynqmp_virt_defconfig
make -j

Series depends on patches sent before that's why here is full tree:
https://github.com/michalsimek/u-boot/tree/20191209-mainline

Thanks,
Michal

Michal Simek (2):
arm64: zynqmp: Add missing Kconfig options to zynqmp_virt platform
arm64: zynqmp: Use zynqmp_virt platform

 configs/avnet_ultra96_rev1_defconfig          |  90 --------------
 configs/xilinx_zynqmp_a2197_revA_defconfig    | 113 ------------------
 .../xilinx_zynqmp_e_a2197_00_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_g_a2197_00_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_01_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_02_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_03_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_p_a2197_00_revA_defconfig   | 111 -----------------
 configs/xilinx_zynqmp_virt_defconfig          |  28 ++++-
 configs/xilinx_zynqmp_zc1232_revA_defconfig   |  50 --------
 configs/xilinx_zynqmp_zc1254_revA_defconfig   |  50 --------
 .../xilinx_zynqmp_zc1751_xm015_dc1_defconfig  |  95 ---------------
 .../xilinx_zynqmp_zc1751_xm018_dc4_defconfig  |  68 -----------
 .../xilinx_zynqmp_zc1751_xm019_dc5_defconfig  |  61 ----------
 configs/xilinx_zynqmp_zcu100_revC_defconfig   |  87 --------------
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 112 -----------------
 configs/xilinx_zynqmp_zcu102_revA_defconfig   | 112 -----------------
 configs/xilinx_zynqmp_zcu102_revB_defconfig   | 111 -----------------
 configs/xilinx_zynqmp_zcu104_revA_defconfig   |  92 --------------
 configs/xilinx_zynqmp_zcu104_revC_defconfig   |  96 ---------------
 configs/xilinx_zynqmp_zcu106_revA_defconfig   | 105 ----------------
 configs/xilinx_zynqmp_zcu111_revA_defconfig   |  94 ---------------
 configs/xilinx_zynqmp_zcu1275_revA_defconfig  |  50 --------
 configs/xilinx_zynqmp_zcu1275_revB_defconfig  |  59 ---------
 configs/xilinx_zynqmp_zcu216_revA_defconfig   |  95 ---------------
 25 files changed, 26 insertions(+), 2208 deletions(-)
 delete mode 100644 configs/avnet_ultra96_rev1_defconfig
 delete mode 100644 configs/xilinx_zynqmp_a2197_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_e_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_g_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_01_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_02_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_03_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_p_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1232_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1254_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu100_revC_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_revB_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu104_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu104_revC_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu106_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu111_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu1275_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu1275_revB_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu216_revA_defconfig
Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/2 arm64: zynqmp: Add missing Kconfig options to zynqmp_virt platform

These options are taken from zcu102/104 platforms. Also use OF_SEPARATE instead of OF_BOARD. Maybe at some point this option will be taken back but as of now board detection is not ready.

export DEVICE_TREE="zynqmp-zcu102-revA"
make xilinx_zynqmp_virt_defconfig
make -j

---

 configs/xilinx_zynqmp_virt_defconfig | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)
configs/xilinx_zynqmp_virt_defconfig +25 -2
index c7e365d009ab..90e8c75d29c2 100644
@@ -16,10 +16,13 @@ CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SPL_SPI_LOAD=y
 CONFIG_SPL_ATF=y
+CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
+CONFIG_CMD_BIND=y
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_FPGA_LOADBP=y
@@ -29,14 +32,16 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_POWEROFF=y
 CONFIG_CMD_SDRAM=y
+CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_BOARD=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
@@ -53,7 +58,9 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_ZYNQMPPL=y
 CONFIG_DM_GPIO=y
+CONFIG_GPIO_HOG=y
 CONFIG_XILINX_GPIO=y
+CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_CADENCE=y
 CONFIG_I2C_MUX=y
@@ -65,29 +72,37 @@ CONFIG_I2C_EEPROM=y
 CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
 CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
+CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
+CONFIG_SPI_FLASH_BAR=y
+CONFIG_SF_DUAL_FLASH=y
 CONFIG_SPI_FLASH_ISSI=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_PHY_MARVELL=y
+CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_PHY_NATSEMI=y
 CONFIG_PHY_REALTEK=y
 CONFIG_PHY_TI=y
 CONFIG_PHY_VITESSE=y
+CONFIG_PHY_XILINX_GMII2RGMII=y
 CONFIG_PHY_FIXED=y
-CONFIG_PHY_GIGE=y
 CONFIG_MII=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_ZYNQ_SERIAL=y
 CONFIG_SPI=y
+CONFIG_ZYNQ_SPI=y
 CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
@@ -101,4 +116,12 @@ CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
 CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
 CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
 CONFIG_USB_FUNCTION_THOR=y
+CONFIG_USB_ETHER=y
+CONFIG_USB_ETH_CDC=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_WDT=y
+CONFIG_WDT_CDNS=y
+CONFIG_SPL_GZIP=y
+CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
Signature · 1 line
2.24.0
#2 lore raw

PATCH 2/2 arm64: zynqmp: Use zynqmp_virt platform

In reply to Michal Simek

Decrease amount of the similar defconfigs and use generic one instead. The change was declared by commit 4b37c13dc353
("arm64: zynqmp: Introduce virtual defconfig") and this patch removes configs for the most of the boards. Utra96/zcu100/zcu102/zcu102 and ZynqMP based System controllers *a2197*. have been also boot tested to make sure that funcionality remains the same.

---

 configs/avnet_ultra96_rev1_defconfig          |  90 --------------
 configs/xilinx_zynqmp_a2197_revA_defconfig    | 113 ------------------
 .../xilinx_zynqmp_e_a2197_00_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_g_a2197_00_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_01_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_02_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_03_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_p_a2197_00_revA_defconfig   | 111 -----------------
 configs/xilinx_zynqmp_virt_defconfig          |   1 +
 configs/xilinx_zynqmp_zc1232_revA_defconfig   |  50 --------
 configs/xilinx_zynqmp_zc1254_revA_defconfig   |  50 --------
 .../xilinx_zynqmp_zc1751_xm015_dc1_defconfig  |  95 ---------------
 .../xilinx_zynqmp_zc1751_xm018_dc4_defconfig  |  68 -----------
 .../xilinx_zynqmp_zc1751_xm019_dc5_defconfig  |  61 ----------
 configs/xilinx_zynqmp_zcu100_revC_defconfig   |  87 --------------
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 112 -----------------
 configs/xilinx_zynqmp_zcu102_revA_defconfig   | 112 -----------------
 configs/xilinx_zynqmp_zcu102_revB_defconfig   | 111 -----------------
 configs/xilinx_zynqmp_zcu104_revA_defconfig   |  92 --------------
 configs/xilinx_zynqmp_zcu104_revC_defconfig   |  96 ---------------
 configs/xilinx_zynqmp_zcu106_revA_defconfig   | 105 ----------------
 configs/xilinx_zynqmp_zcu111_revA_defconfig   |  94 ---------------
 configs/xilinx_zynqmp_zcu1275_revA_defconfig  |  50 --------
 configs/xilinx_zynqmp_zcu1275_revB_defconfig  |  59 ---------
 configs/xilinx_zynqmp_zcu216_revA_defconfig   |  95 ---------------
 25 files changed, 1 insertion(+), 2206 deletions(-)
 delete mode 100644 configs/avnet_ultra96_rev1_defconfig
 delete mode 100644 configs/xilinx_zynqmp_a2197_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_e_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_g_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_01_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_02_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_03_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_p_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1232_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1254_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu100_revC_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_revB_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu104_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu104_revC_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu106_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu111_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu1275_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu1275_revB_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu216_revA_defconfig
configs/avnet_ultra96_rev1_defconfig deleted +0 -90
deleted file mode 100644
index 43aacf322ba3..000000000000
@@ -1,90 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_ZYNQMP=y
-CONFIG_SYS_TEXT_BASE=0x8000000
-CONFIG_SYS_MALLOC_F_LEN=0x8000
-CONFIG_SPL=y
-CONFIG_DEBUG_UART_BASE=0xff010000
-CONFIG_DEBUG_UART_CLOCK=100000000
-CONFIG_ZYNQ_SDHCI_MAX_FREQ=15000000
-CONFIG_ZYNQMP_USB=y
-CONFIG_DEBUG_UART=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_FIT=y
-CONFIG_FIT_VERBOSE=y
-CONFIG_SPL_LOAD_FIT=y
-# CONFIG_DISPLAY_CPUINFO is not set
-CONFIG_SPL_OS_BOOT=y
-CONFIG_SPL_RAM_SUPPORT=y
-CONFIG_SPL_RAM_DEVICE=y
-CONFIG_SPL_ATF=y
-CONFIG_CMD_BOOTMENU=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_BIND=y
-CONFIG_CMD_CLK=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_FPGA_LOADBP=y
-CONFIG_CMD_FPGA_LOADP=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_POWEROFF=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_TFTPPUT=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_TIMER=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="avnet-ultra96-rev1"
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_SPL_DM=y
-CONFIG_SPL_DM_SEQ_ALIAS=y
-CONFIG_CLK_ZYNQMP=y
-CONFIG_DFU_RAM=y
-CONFIG_FPGA_XILINX=y
-CONFIG_FPGA_ZYNQMPPL=y
-CONFIG_DM_GPIO=y
-CONFIG_XILINX_GPIO=y
-CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_CADENCE=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_PCA954x=y
-CONFIG_LED=y
-CONFIG_LED_GPIO=y
-CONFIG_MISC=y
-CONFIG_SUPPORT_EMMC_BOOT=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_ZYNQ=y
-CONFIG_SPI_FLASH_BAR=y
-CONFIG_SPI_FLASH_ISSI=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
-# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
-# CONFIG_NETDEVICES is not set
-CONFIG_DEBUG_UART_ZYNQ=y
-CONFIG_DEBUG_UART_ANNOUNCE=y
-CONFIG_ZYNQ_SERIAL=y
-CONFIG_SPI=y
-CONFIG_ZYNQ_SPI=y
-CONFIG_USB=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_DWC3=y
-CONFIG_USB_DWC3_GENERIC=y
-CONFIG_USB_ULPI_VIEWPORT=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_USB_ETHER=y
-CONFIG_USB_ETH_CDC=y
-CONFIG_USB_HOST_ETHER=y
-CONFIG_USB_ETHER_ASIX=y
-CONFIG_WDT=y
-CONFIG_WDT_CDNS=y
-CONFIG_SPL_GZIP=y
-CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
configs/xilinx_zynqmp_a2197_revA_defconfig deleted +0 -113

113 lines not on this page · raw message

configs/xilinx_zynqmp_e_a2197_00_revA_defconfig deleted +0 -111

111 lines not on this page · raw message

configs/xilinx_zynqmp_g_a2197_00_revA_defconfig deleted +0 -111

111 lines not on this page · raw message

configs/xilinx_zynqmp_m_a2197_01_revA_defconfig deleted +0 -111

111 lines not on this page · raw message

configs/xilinx_zynqmp_m_a2197_02_revA_defconfig deleted +0 -111

111 lines not on this page · raw message

configs/xilinx_zynqmp_m_a2197_03_revA_defconfig deleted +0 -111

111 lines not on this page · raw message

configs/xilinx_zynqmp_p_a2197_00_revA_defconfig deleted +0 -111

111 lines not on this page · raw message

configs/xilinx_zynqmp_virt_defconfig +1 -0
index 90e8c75d29c2..4047475d3c11 100644
@@ -42,6 +42,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_LIST="avnet-ultra96-rev1 zynqmp-a2197-revA zynqmp-e-a2197-00-revA zynqmp-g-a2197-00-revA zynqmp-m-a2197-01-revA zynqmp-m-a2197-02-revA zynqmp-m-a2197-03-revA zynqmp-p-a2197-00-revA zynqmp-zc1232-revA zynqmp-zc1254-revA zynqmp-zc1751-xm015-dc1 zynqmp-zc1751-xm018-dc4 zynqmp-zc1751-xm019-dc5 zynqmp-zcu100-revC zynqmp-zcu102-rev1.0 zynqmp-zcu102-revA zynqmp-zcu102-revB zynqmp-zcu104-revA zynqmp-zcu104-revC zynqmp-zcu106-revA zynqmp-zcu111-revA zynqmp-zcu1275-revA zynqmp-zcu1275-revB zynqmp-zcu216-revA"
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
configs/xilinx_zynqmp_zc1232_revA_defconfig deleted +0 -50

50 lines not on this page · raw message

configs/xilinx_zynqmp_zc1254_revA_defconfig deleted +0 -50

50 lines not on this page · raw message

configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig deleted +0 -95

95 lines not on this page · raw message

configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig deleted +0 -68

68 lines not on this page · raw message

configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig deleted +0 -61

61 lines not on this page · raw message

configs/xilinx_zynqmp_zcu100_revC_defconfig deleted +0 -87

87 lines not on this page · raw message

configs/xilinx_zynqmp_zcu102_rev1_0_defconfig deleted +0 -112

112 lines not on this page · raw message

configs/xilinx_zynqmp_zcu102_revA_defconfig deleted +0 -112

112 lines not on this page · raw message

configs/xilinx_zynqmp_zcu102_revB_defconfig deleted +0 -111

111 lines not on this page · raw message

configs/xilinx_zynqmp_zcu104_revA_defconfig deleted +0 -92

92 lines not on this page · raw message

configs/xilinx_zynqmp_zcu104_revC_defconfig deleted +0 -96

96 lines not on this page · raw message

configs/xilinx_zynqmp_zcu106_revA_defconfig deleted +0 -105

105 lines not on this page · raw message

configs/xilinx_zynqmp_zcu111_revA_defconfig deleted +0 -94

94 lines not on this page · raw message

configs/xilinx_zynqmp_zcu1275_revA_defconfig deleted +0 -50

50 lines not on this page · raw message

configs/xilinx_zynqmp_zcu1275_revB_defconfig deleted +0 -59

59 lines not on this page · raw message

configs/xilinx_zynqmp_zcu216_revA_defconfig deleted +0 -95

95 lines not on this page · raw message

Signature · 1 line
2.24.0
#3 lore raw

cover arm64: zynqmp: Cleanup defconfigs

In reply to Michal Simek

Hi Tom,

Quoted 7 lines · Michal Simek

Hi,

over years a lot of new Xilinx ZynqMP board have been added to U-Boot with corresponding defconfigs. Also a lot of drivers have been moved to DM that we can make one generic configuration with one defconfig.
Nand still needs to be validated that's why dc2/dc3 are not moved yet.

Quoted 7 lines

Boards can be build like this:
export DEVICE_TREE="avnet-ultra96-rev1"
make xilinx_zynqmp_virt_defconfig
make -j

Series depends on patches sent before that's why here is full tree:
https://github.com/michalsimek/u-boot/tree/20191209-mainline

This series will require some changes in CI loops because right now I didn't setup default device tree (CONFIG_DEFAULT_DEVICE_TREE) to "force" everybody to properly pass DEVICE_TREE via command line. I can't use OF_BOARD because then SPL is built without DT at all.

How do you think I should handle it for CI loops?
1. I can remove this configuration but it will be only one at the end that's why not a good solution.
2. Add generic option to run some commands before tests like export DEVICE_TREE above
3. provide different options for SPL/full u-boot how OF_SEPARATE/OF_BOARD is handled.

Thanks for your suggestions,
Michal

#4 lore raw

cover arm64: zynqmp: Cleanup defconfigs

Quoted 23 lines · Michal Simek

Hi Tom,

Quoted 7 lines · Michal Simek

Hi,

over years a lot of new Xilinx ZynqMP board have been added to U-Boot with corresponding defconfigs. Also a lot of drivers have been moved to DM that we can make one generic configuration with one defconfig.
Nand still needs to be validated that's why dc2/dc3 are not moved yet.

Quoted 7 lines

Boards can be build like this:
export DEVICE_TREE="avnet-ultra96-rev1"
make xilinx_zynqmp_virt_defconfig
make -j

Series depends on patches sent before that's why here is full tree:
https://github.com/michalsimek/u-boot/tree/20191209-mainline

This series will require some changes in CI loops because right now I didn't setup default device tree (CONFIG_DEFAULT_DEVICE_TREE) to "force" everybody to properly pass DEVICE_TREE via command line. I can't use OF_BOARD because then SPL is built without DT at all.

Quoted 7 lines

How do you think I should handle it for CI loops?
1. I can remove this configuration but it will be only one at the end that's why not a good solution.
2. Add generic option to run some commands before tests like export DEVICE_TREE above
3. provide different options for SPL/full u-boot how OF_SEPARATE/OF_BOARD is handled.

So, for CI are you wanting to test most device trees, or just one? Are we able to run one of these device trees via QEMU? If we can run the virt defconfig via qemu, we should just update/extend that stanza in the CI files to set DEVICE_TREE and exclude building it from the normal jobs. If we can't run via qemu then yes, something like option #2 and we set DEVICE_TREE in one job and export it if set in the build job.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191210/3a7a3ed6/attachment.sig>
#5 lore raw

cover arm64: zynqmp: Cleanup defconfigs

Quoted 32 lines · Tom Rini
Quoted 23 lines · Michal Simek

Hi Tom,

Quoted 7 lines · Michal Simek

Hi,

over years a lot of new Xilinx ZynqMP board have been added to U-Boot with corresponding defconfigs. Also a lot of drivers have been moved to DM that we can make one generic configuration with one defconfig.
Nand still needs to be validated that's why dc2/dc3 are not moved yet.

Quoted 7 lines

Boards can be build like this:
export DEVICE_TREE="avnet-ultra96-rev1"
make xilinx_zynqmp_virt_defconfig
make -j

Series depends on patches sent before that's why here is full tree:
https://github.com/michalsimek/u-boot/tree/20191209-mainline

This series will require some changes in CI loops because right now I didn't setup default device tree (CONFIG_DEFAULT_DEVICE_TREE) to "force" everybody to properly pass DEVICE_TREE via command line. I can't use OF_BOARD because then SPL is built without DT at all.

Quoted 7 lines

How do you think I should handle it for CI loops?
1. I can remove this configuration but it will be only one at the end that's why not a good solution.
2. Add generic option to run some commands before tests like export DEVICE_TREE above
3. provide different options for SPL/full u-boot how OF_SEPARATE/OF_BOARD is handled.

Quoted 1 line

So, for CI are you wanting to test most device trees, or just one?

All zynqmp dtses are built by default.

Quoted 2 lines

Are
we able to run one of these device trees via QEMU?

zynqmp is covered just by buildman not by pytest. I have this on my todo list for some time but there will be other issues with mainline qemu to do so.

Quoted 4 lines

If we can run the
virt defconfig via qemu, we should just update/extend that stanza in the CI files to set DEVICE_TREE and exclude building it from the normal jobs.

Based on next generation Xilinx Versal where we use OF_BOARD qemu is generated DT for model self to ensure that only stuff which are emulated are provided to SW. Logic for dt selection is quite simply.
https://github.com/Xilinx/u-boot-xlnx/blob/master/arch/arm/mach-versal/cpu.c#L112
But Versal is not using SPL and SPL needs initial DT. Also standard Xilinx boot flow on zynq/zynqmp is not using SPL and SPL is community driven effort.

At the end of the day I would like to use the same functionality across boards. It means full u-boot should check one fixed location for DT first with priority. For this OF_SEPARATE can be also used because board_fdt_blob_setup can be overwritten for these cases too.
https://gitlab.denx.de/u-boot/u-boot/blob/master/lib/fdtdec.c#L1190

Quoted 2 lines

If we can't run via qemu then yes, something like option #2 and
we set DEVICE_TREE in one job and export it if set in the build job.

It means for qemu there is no real need to build dts from source tree at all.
Let me look at #2 for CI.

Thanks,
Michal

#6 lore raw

cover arm64: zynqmp: Cleanup defconfigs

Quoted 33 lines · Michal Simek
Quoted 32 lines · Tom Rini
Quoted 30 lines · Michal Simek

Hi Tom,

Quoted 7 lines · Michal Simek

Hi,

over years a lot of new Xilinx ZynqMP board have been added to U-Boot with corresponding defconfigs. Also a lot of drivers have been moved to DM that we can make one generic configuration with one defconfig.
Nand still needs to be validated that's why dc2/dc3 are not moved yet.

Quoted 7 lines

Boards can be build like this:
export DEVICE_TREE="avnet-ultra96-rev1"
make xilinx_zynqmp_virt_defconfig
make -j

Series depends on patches sent before that's why here is full tree:
https://github.com/michalsimek/u-boot/tree/20191209-mainline

This series will require some changes in CI loops because right now I didn't setup default device tree (CONFIG_DEFAULT_DEVICE_TREE) to "force" everybody to properly pass DEVICE_TREE via command line. I can't use OF_BOARD because then SPL is built without DT at all.

How do you think I should handle it for CI loops?
1. I can remove this configuration but it will be only one at the end that's why not a good solution.
2. Add generic option to run some commands before tests like export DEVICE_TREE above
3. provide different options for SPL/full u-boot how OF_SEPARATE/OF_BOARD is handled.

Quoted 3 lines
Quoted 1 line

So, for CI are you wanting to test most device trees, or just one?

All zynqmp dtses are built by default.

Right, but for what I thought you're saying the real use is, you pass just a single device tree, right? If so, do you think we should loop over each, or just build one?

Quoted 6 lines
Quoted 2 lines

Are
we able to run one of these device trees via QEMU?

zynqmp is covered just by buildman not by pytest. I have this on my todo list for some time but there will be other issues with mainline qemu to do so.

OK, so something to improve for the future, and after we handle this "today" problem.

Quoted 19 lines
Quoted 4 lines

If we can run the
virt defconfig via qemu, we should just update/extend that stanza in the CI files to set DEVICE_TREE and exclude building it from the normal jobs.

Based on next generation Xilinx Versal where we use OF_BOARD qemu is generated DT for model self to ensure that only stuff which are emulated are provided to SW. Logic for dt selection is quite simply.
https://github.com/Xilinx/u-boot-xlnx/blob/master/arch/arm/mach-versal/cpu.c#L112
But Versal is not using SPL and SPL needs initial DT. Also standard Xilinx boot flow on zynq/zynqmp is not using SPL and SPL is community driven effort.

At the end of the day I would like to use the same functionality across boards. It means full u-boot should check one fixed location for DT first with priority. For this OF_SEPARATE can be also used because board_fdt_blob_setup can be overwritten for these cases too.
https://gitlab.denx.de/u-boot/u-boot/blob/master/lib/fdtdec.c#L1190

Quoted 6 lines
Quoted 2 lines

If we can't run via qemu then yes, something like option #2 and
we set DEVICE_TREE in one job and export it if set in the build job.

It means for qemu there is no real need to build dts from source tree at all.
Let me look at #2 for CI.

OK, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191210/d74e4f4b/attachment.sig>
#7 lore raw

cover arm64: zynqmp: Cleanup defconfigs

Quoted 71 lines · Tom Rini
Quoted 33 lines · Michal Simek
Quoted 32 lines · Tom Rini
Quoted 30 lines · Michal Simek

Hi Tom,

Quoted 7 lines · Michal Simek

Hi,

over years a lot of new Xilinx ZynqMP board have been added to U-Boot with corresponding defconfigs. Also a lot of drivers have been moved to DM that we can make one generic configuration with one defconfig.
Nand still needs to be validated that's why dc2/dc3 are not moved yet.

Quoted 7 lines

Boards can be build like this:
export DEVICE_TREE="avnet-ultra96-rev1"
make xilinx_zynqmp_virt_defconfig
make -j

Series depends on patches sent before that's why here is full tree:
https://github.com/michalsimek/u-boot/tree/20191209-mainline

This series will require some changes in CI loops because right now I didn't setup default device tree (CONFIG_DEFAULT_DEVICE_TREE) to "force" everybody to properly pass DEVICE_TREE via command line. I can't use OF_BOARD because then SPL is built without DT at all.

How do you think I should handle it for CI loops?
1. I can remove this configuration but it will be only one at the end that's why not a good solution.
2. Add generic option to run some commands before tests like export DEVICE_TREE above
3. provide different options for SPL/full u-boot how OF_SEPARATE/OF_BOARD is handled.

Quoted 3 lines
Quoted 1 line

So, for CI are you wanting to test most device trees, or just one?

All zynqmp dtses are built by default.

Right, but for what I thought you're saying the real use is, you pass just a single device tree, right? If so, do you think we should loop over each, or just build one?

Quoted 6 lines
Quoted 2 lines

Are
we able to run one of these device trees via QEMU?

zynqmp is covered just by buildman not by pytest. I have this on my todo list for some time but there will be other issues with mainline qemu to do so.

OK, so something to improve for the future, and after we handle this "today" problem.

Quoted 19 lines
Quoted 4 lines

If we can run the
virt defconfig via qemu, we should just update/extend that stanza in the CI files to set DEVICE_TREE and exclude building it from the normal jobs.

Based on next generation Xilinx Versal where we use OF_BOARD qemu is generated DT for model self to ensure that only stuff which are emulated are provided to SW. Logic for dt selection is quite simply.
https://github.com/Xilinx/u-boot-xlnx/blob/master/arch/arm/mach-versal/cpu.c#L112
But Versal is not using SPL and SPL needs initial DT. Also standard Xilinx boot flow on zynq/zynqmp is not using SPL and SPL is community driven effort.

At the end of the day I would like to use the same functionality across boards. It means full u-boot should check one fixed location for DT first with priority. For this OF_SEPARATE can be also used because board_fdt_blob_setup can be overwritten for these cases too.
https://gitlab.denx.de/u-boot/u-boot/blob/master/lib/fdtdec.c#L1190

Quoted 9 lines
Quoted 6 lines
Quoted 2 lines

If we can't run via qemu then yes, something like option #2 and
we set DEVICE_TREE in one job and export it if set in the build job.

It means for qemu there is no real need to build dts from source tree at all.
Let me look at #2 for CI.

OK, thanks!

I have look at it again and there are other strange things. When you select CONFIG_SPL_FIT_GENERATOR then there is no reason to generate u-boot.img (because you want to replace this by your generator) or append dtb behind u-boot.bin (because default option is already setup in fit format).

CAT u-boot-dtb.bin
MKIMAGE u-boot.img
MKIMAGE u-boot-dtb.img
COPY u-boot.bin
LD u-boot.elf
MKIMAGE u-boot.itb

Regarding travis. just c&p. What about just this?

.travis.yml +3 -0
index 5da046ca7ed5..4cef12e18370 100644
@@ -118,6 +118,9 @@ script:
  # use clang only do one configuration.
  - if [[ "${BUILDMAN}" != "" ]]; then
      ret=0;
+     if [[ "${ENV}" != "" ]]; then
+        export eval `echo ${ENV}`;
+     fi;
      tools/buildman/buildman -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?;
      if [[ $ret -ne 0 && $ret -ne 129 ]]; then
        tools/buildman/buildman -sdeP ${BUILDMAN};

And then job like this
- name: "buildman ZynqMP Virt"
env:
- ENV="DEVICE_TREE=zynqmp-zcu100-revC"
- BUILDMAN="xilinx_zynqmp_virt"

Or do you see any smarter way how this can be done?

Thanks,
Michal

#8 lore raw

cover arm64: zynqmp: Cleanup defconfigs

In reply to Michal Simek

po 9. 12. 2019 v 16:19 odesílatel Michal Simek <[email protected]> napsal:

Quoted 75 lines

Hi,

over years a lot of new Xilinx ZynqMP board have been added to U-Boot with corresponding defconfigs. Also a lot of drivers have been moved to DM that we can make one generic configuration with one defconfig.
Nand still needs to be validated that's why dc2/dc3 are not moved yet.

Boards can be build like this:
export DEVICE_TREE="avnet-ultra96-rev1"
make xilinx_zynqmp_virt_defconfig
make -j

Series depends on patches sent before that's why here is full tree:
https://github.com/michalsimek/u-boot/tree/20191209-mainline

Thanks,
Michal

Michal Simek (2):
arm64: zynqmp: Add missing Kconfig options to zynqmp_virt platform
arm64: zynqmp: Use zynqmp_virt platform

 configs/avnet_ultra96_rev1_defconfig          |  90 --------------
 configs/xilinx_zynqmp_a2197_revA_defconfig    | 113 ------------------
 .../xilinx_zynqmp_e_a2197_00_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_g_a2197_00_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_01_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_02_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_m_a2197_03_revA_defconfig   | 111 -----------------
 .../xilinx_zynqmp_p_a2197_00_revA_defconfig   | 111 -----------------
 configs/xilinx_zynqmp_virt_defconfig          |  28 ++++-
 configs/xilinx_zynqmp_zc1232_revA_defconfig   |  50 --------
 configs/xilinx_zynqmp_zc1254_revA_defconfig   |  50 --------
 .../xilinx_zynqmp_zc1751_xm015_dc1_defconfig  |  95 ---------------
 .../xilinx_zynqmp_zc1751_xm018_dc4_defconfig  |  68 -----------
 .../xilinx_zynqmp_zc1751_xm019_dc5_defconfig  |  61 ----------
 configs/xilinx_zynqmp_zcu100_revC_defconfig   |  87 --------------
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 112 -----------------
 configs/xilinx_zynqmp_zcu102_revA_defconfig   | 112 -----------------
 configs/xilinx_zynqmp_zcu102_revB_defconfig   | 111 -----------------
 configs/xilinx_zynqmp_zcu104_revA_defconfig   |  92 --------------
 configs/xilinx_zynqmp_zcu104_revC_defconfig   |  96 ---------------
 configs/xilinx_zynqmp_zcu106_revA_defconfig   | 105 ----------------
 configs/xilinx_zynqmp_zcu111_revA_defconfig   |  94 ---------------
 configs/xilinx_zynqmp_zcu1275_revA_defconfig  |  50 --------
 configs/xilinx_zynqmp_zcu1275_revB_defconfig  |  59 ---------
 configs/xilinx_zynqmp_zcu216_revA_defconfig   |  95 ---------------
 25 files changed, 26 insertions(+), 2208 deletions(-)
 delete mode 100644 configs/avnet_ultra96_rev1_defconfig
 delete mode 100644 configs/xilinx_zynqmp_a2197_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_e_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_g_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_01_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_02_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_m_a2197_03_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_p_a2197_00_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1232_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1254_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu100_revC_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu102_revB_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu104_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu104_revC_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu106_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu111_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu1275_revA_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu1275_revB_defconfig
 delete mode 100644 configs/xilinx_zynqmp_zcu216_revA_defconfig
Quoted 3 lines

--
2.24.0

Applied but with default DT setup because I couldn't find proper setup to pass CI loop.
Something to take a look later.

M

Signature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs