Merge tag 'xilinx-for-v2022.01-rc3' of https://source.denx.de/u-boot/custodians/u...
authorTom Rini <trini@konsulko.com>
Tue, 16 Nov 2021 14:51:04 +0000 (09:51 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 16 Nov 2021 14:51:04 +0000 (09:51 -0500)
Xilinx changes for v2022.01-rc3

sdhci:
- Fix emmc mini case with missing firmware interface

zynqmp:
- Restore JTAG interface if required
- Allow overriding board name
- Add support for DLC21
- Fix one fallthrought statement description
- Use config macro instead of name duplication
- Save multiboot to variable

firmware:
- Handle ipi_req errors better
- Use local buffer in case user doesn't need it instead of NULL/0 location

spi:
- gqsi: Fix write issue at low frequencies

net:
- gem: Disable broadcasts

1  2 
arch/arm/dts/Makefile
configs/xilinx_zynqmp_virt_defconfig

diff --combined arch/arm/dts/Makefile
@@@ -28,13 -28,6 +28,13 @@@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arn
        exynos5800-peach-pi.dtb \
        exynos5422-odroidxu3.dtb
  dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb
 +dtb-$(CONFIG_TARGET_A5Y17LTE) += exynos78x0-axy17lte.dtb
 +dtb-$(CONFIG_TARGET_A3Y17LTE) += exynos78x0-axy17lte.dtb
 +dtb-$(CONFIG_TARGET_A7Y17LTE) += exynos78x0-axy17lte.dtb
 +
 +dtb-$(CONFIG_ARCH_APPLE) += \
 +      t8103-j274.dtb \
 +      t8103-j293.dtb
  
  dtb-$(CONFIG_ARCH_DAVINCI) += \
        da850-evm.dtb \
@@@ -319,6 -312,7 +319,7 @@@ dtb-$(CONFIG_ARCH_ZYNQMP) += 
        avnet-ultra96-rev1.dtb                  \
        avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dtb        \
        zynqmp-a2197-revA.dtb                   \
+       zynqmp-dlc21-revA.dtb                   \
        zynqmp-e-a2197-00-revA.dtb              \
        zynqmp-g-a2197-00-revA.dtb              \
        zynqmp-m-a2197-01-revA.dtb              \
@@@ -480,7 -474,6 +481,7 @@@ dtb-$(CONFIG_TARGET_SL28) += fsl-ls1028
  
  dtb-$(CONFIG_TARGET_DRAGONBOARD410C) += dragonboard410c.dtb
  dtb-$(CONFIG_TARGET_DRAGONBOARD820C) += dragonboard820c.dtb
 +dtb-$(CONFIG_TARGET_STARQLTECHN) += starqltechn.dtb
  
  dtb-$(CONFIG_TARGET_STEMMY) += ste-ux500-samsung-stemmy.dtb
  
@@@ -830,14 -823,11 +831,14 @@@ dtb-$(CONFIG_MX6UL) += 
        imx6ul-liteboard.dtb \
        imx6ul-phytec-segin-ff-rdk-nand.dtb \
        imx6ul-pico-hobbit.dtb \
 -      imx6ul-pico-pi.dtb
 +      imx6ul-pico-pi.dtb \
 +      imx6ul-kontron-n631x-s.dtb \
 +      imx6ull-kontron-n641x-s.dtb
  
  dtb-$(CONFIG_MX6ULL) += \
        imx6ull-14x14-evk.dtb \
        imx6ull-colibri.dtb \
 +      imx6ull-colibri-emmc.dtb \
        imx6ull-myir-mys-6ulx-eval.dtb \
        imx6ull-seeed-npi-imx6ull-dev-board.dtb \
        imx6ull-phytec-segin-ff-rdk-emmc.dtb \
@@@ -888,8 -878,6 +889,8 @@@ dtb-$(CONFIG_ARCH_IMX8M) += 
        imx8mm-evk.dtb \
        imx8mm-icore-mx8mm-ctouch2.dtb \
        imx8mm-icore-mx8mm-edimm2.2.dtb \
 +      imx8mm-kontron-n801x-s.dtb \
 +      imx8mm-kontron-n801x-s-lvds.dtb \
        imx8mm-venice.dtb \
        imx8mm-venice-gw71xx-0x.dtb \
        imx8mm-venice-gw72xx-0x.dtb \
@@@ -1157,8 -1145,6 +1158,8 @@@ dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += c
  
  dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE) += imx8mm-cl-iot-gate.dtb
  
 +dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE_OPTEE) += imx8mm-cl-iot-gate-optee.dtb
 +
  dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb
  
  targets += $(dtb-y)
@@@ -2,10 -2,10 +2,10 @@@ CONFIG_ARM=
  CONFIG_POSITION_INDEPENDENT=y
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_SYS_TEXT_BASE=0x8000000
 +CONFIG_SYS_MALLOC_LEN=0x4040000
  CONFIG_SYS_MALLOC_F_LEN=0x8000
  CONFIG_SYS_MEMTEST_START=0x00000000
  CONFIG_SYS_MEMTEST_END=0x00001000
 -CONFIG_SYS_MALLOC_LEN=0x4040000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC"
  CONFIG_SPL_STACK_R_ADDR=0x18000000
@@@ -81,7 -81,7 +81,7 @@@ CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES=
  CONFIG_CMD_UBI=y
  CONFIG_PARTITION_TYPE_GUID=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-xm016-dc2 zynqmp-zc1751-xm017-dc3 zynqmp-zc1751-xm018-dc4 zynqmp-zc1751-xm019-dc5 zynqmp-zcu100-revC zynqmp-zcu102-rev1.1 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-zcu1285-revA zynqmp-zcu208-revA zynqmp-zcu216-revA zynqmp-topic-miamimp-xilinx-xdp-v1r1 zynqmp-sm-k26-revA zynqmp-smk-k26-revA"
+ 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-xm016-dc2 zynqmp-zc1751-xm017-dc3 zynqmp-zc1751-xm018-dc4 zynqmp-zc1751-xm019-dc5 zynqmp-zcu100-revC zynqmp-zcu102-rev1.1 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-zcu1285-revA zynqmp-zcu208-revA zynqmp-zcu216-revA zynqmp-topic-miamimp-xilinx-xdp-v1r1 zynqmp-sm-k26-revA zynqmp-smk-k26-revA zynqmp-dlc21-revA"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent interrupts iommus power-domains"
  CONFIG_ENV_IS_NOWHERE=y
  CONFIG_ENV_IS_IN_FAT=y
@@@ -101,10 -101,10 +101,10 @@@ CONFIG_CLK_ZYNQMP=
  CONFIG_DFU_TFTP=y
  CONFIG_DFU_TIMEOUT=y
  CONFIG_DFU_MMC=y
 +CONFIG_DFU_MTD=y
  CONFIG_DFU_NAND=y
  CONFIG_DFU_RAM=y
  CONFIG_DFU_SF=y
 -CONFIG_DFU_MTD=y
  CONFIG_SET_DFU_ALT_INFO=y
  CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1800000
  CONFIG_USB_FUNCTION_FASTBOOT=y