Skip to contentSkip to conversation

xilinx patches for v2023.04-rc1

GIT PULL Michal Simek 2 participants 2 messages Jan 27, 2023

lore
Share & tools
lore
#0 lore raw

Hi Tom,

please pull these patches to your tree. Buildman doesn't show any issue and CI looks also good.
https://source.denx.de/u-boot/custodians/u-boot-microblaze/-/commit/f0f86d39fec73479d4904e6d5b9db01a29597d58

Thanks,
Michal

The following changes since commit 7b84c973b96775576dcff228d865e8570be26c82:

ns16650: Correct CONFIG_SYS_NS16550_MEM32 platforms (2023-01-09 11:30:49 -0500)

are available in the Git repository at:

[email protected]:u-boot/custodians/u-boot-microblaze.git
tags/xilinx-for-v2023.04-rc1

for you to fetch changes up to f0f86d39fec73479d4904e6d5b9db01a29597d58:

fru: ops: Display FRU fields properly for 0xc1 fields (2023-01-27 08:49:24
+0100)

----------------------------------------------------------------
Xilinx chnages for v2023.04-rc1

makefile:
- Add multi_dtb_fit dependency

clk:
- Handle error cases

microblaze:
- Disable falcon mode and cleanup code around

xilinx:
- Enable regular expression matching in board_fit_config_name_match()
- Fix FRU handling for 0xC1 format
- Fix Xilinx legacy format eeprom parsing

zynqmp:
- Some DT updates/cleanups
- Fix IDcode for xck24
- Remove empty mini config files
- Add support for k24

versal:
- Remove empty mini config files

versal_net:
- Setup timer when runs in EL3
- Build u-boot.elf for mini configurations

zynq-gem:
- Add support for new compatible strings
- Remove support for Avnet Ultrazedev SOM
- Handle SGMII with PCS phy

spi:
- Add support for gigadevice parts

misc:
- Remove CONFIG_TARGET_VENUS ifdef
- Add missing headers to remove sparse warnings

----------------------------------------------------------------
Algapally Santosh Sagar (5):
xilinx: common: Include header file to fix warning
gpio: zynqmp: Handle error from get_gpio_modepin
xilinx: versal: Add missing header
drivers: mmc: Change datatype of tuning_loop_counter to int
fru: ops: Display FRU fields properly for 0xc1 fields

Ashok Reddy Soma (1):
xilinx: versal-net: Add support for timer and start it

Harini Katakam (2):
arm64: zynqmp: Describe TI phy as ethernet phy ID on ZCU102 RevB & up
arm64: zynqmp: Enable TI phy reset via GPIO

Jay Buddhabhatti (1):
clk: versal: Return error in case if clock setup failed

Luca Ceresoli (1):
arm64: zynqmp: remove Avnet UltraZed-EV Starter Kit

Michal Simek (19):
arm64: zynqmp: Sync #dma-cells property location
arm64: zynqmp: Added GEM reset definitions
arm64: zynqmp: Fix AMS device tree node
arm64: zynqmp: Align gpio-key node names with dtschema
arm64: zynqmp: Remove id from usb node name
net: zynq_gem: Add support for new compatible str with xlnx prefix
arm64: zynqmp: Remove unused USB DT properties
arm64: zynqmp: Remove unused snps,refclk_fladj property
board: presidio-asic: Remove CONFIG_TARGET_VENUS
xilinx: common: Add support for partial string match in
board_fit_config_name_match()
soc: zynqmp: Fix IDcode for xck24
arm64: zynqmp: Remove xilinx_zynqmp_mini_emmc/qspi.h configs arm64: versal: Remove xilinx_versal_mini_qspi.h configs
arm64: zynqmp: Fill model name for SOM CCs
arm64: zynqmp: Add support for Kria K24 SOM
arm64: versal-net: Enable remaking ELF from bin
xilinx: board: Use ETH_ALEN macro for mac address size
xilinx: board: Fix xilinx_eeprom_legacy_cleanup()
xilinx: board: Update logic in xilinx_read_eeprom_legacy

Neal Frager (1):
makefile: add multi_dtb_fit dep

Ovidiu Panait (3):
microblaze: spl: wrap spl_start_uboot() in SPL_OS_BOOT ifdefs
microblaze: spl: drop boot_linux
microblaze: spl: disable falcon mode by default

Stefan Roese (1):
net: zynq_gem: Wait for SGMII PCS link in zynq_gem_init()

Victor Lim (4):
mtd: spi-nor-ids: add gigadevice part #
configs: zynq: enable gigadevice
arm64: zynqmp: enable gigadevice
xilinx: versal: enable gigadevice

Makefile
| 1 +
arch/arm/dts/Makefile
| 3 +-
arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts
| 59 --
arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi
| 56 --
arch/arm/dts/zynqmp-dlc21-revA.dts
| 4 -
arch/arm/dts/zynqmp-g-a2197-00-revA.dts
| 2 -
arch/arm/dts/zynqmp-m-a2197-01-revA.dts
| 4 -
arch/arm/dts/zynqmp-m-a2197-02-revA.dts
| 4 -
arch/arm/dts/zynqmp-m-a2197-03-revA.dts
| 4 -
arch/arm/dts/zynqmp-p-a2197-00-revA.dts
| 4 -
arch/arm/dts/zynqmp-sck-kr-g-revA.dts
| 1 +
arch/arm/dts/zynqmp-sck-kr-g-revB.dts
| 1 +
arch/arm/dts/zynqmp-sck-kv-g-revA.dts
| 1 +
arch/arm/dts/zynqmp-sck-kv-g-revB.dts
| 1 +
arch/arm/dts/zynqmp-sm-k24-revA.dts
| 22 +
arch/arm/dts/zynqmp-sm-k26-revA.dts
| 2 +-
arch/arm/dts/zynqmp-smk-k24-revA.dts
| 21 +
arch/arm/dts/zynqmp-zcu100-revC.dts
| 2 +-
arch/arm/dts/zynqmp-zcu102-revA.dts
| 2 +-
arch/arm/dts/zynqmp-zcu102-revB.dts
| 22 +-
arch/arm/dts/zynqmp-zcu106-revA.dts
| 2 +-
arch/arm/dts/zynqmp-zcu111-revA.dts
| 2 +-
arch/arm/dts/zynqmp.dtsi
| 58 +-
arch/arm/mach-versal-net/Kconfig
| 12 +
arch/arm/mach-versal-net/include/mach/hardware.h
| 30 +
arch/microblaze/cpu/spl.c
| 11 +-
board/cortina/presidio-asic/lowlevel_init.S
| 2 -
board/xilinx/common/board.c
| 57 +-
board/xilinx/common/fru_ops.c
| 43 +-
board/xilinx/versal-net/board.c
| 41 +
board/xilinx/versal/board.c
| 1 +
board/xilinx/zynqmp/MAINTAINERS
| 6 -

board/xilinx/zynqmp/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0/psu_init_gpl.c | 655 ------------
board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c
| 1061 ++++++++++++++++++++
board/xilinx/zynqmp/zynqmp-smk-k24-revA
| 1 +
configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
| 83 --
configs/microblaze-generic_defconfig
| 3 -
configs/xilinx_versal_mini_defconfig
| 2 +-
configs/xilinx_versal_mini_ospi_defconfig
| 2 +-
configs/xilinx_versal_mini_qspi_defconfig
| 3 +-
configs/xilinx_versal_net_mini_defconfig
| 2 +
configs/xilinx_versal_net_virt_defconfig
| 1 +
configs/xilinx_zynq_virt_defconfig
| 1 +
configs/xilinx_zynqmp_mini_defconfig
| 2 +-
configs/xilinx_zynqmp_mini_emmc0_defconfig
| 2 +-
configs/xilinx_zynqmp_mini_emmc1_defconfig
| 2 +-
configs/xilinx_zynqmp_mini_qspi_defconfig
| 3 +-
configs/xilinx_zynqmp_virt_defconfig
| 1 +
configs/zynq_cse_qspi_defconfig
| 1 +
drivers/clk/clk_versal.c
| 4 +-
drivers/gpio/zynqmp_gpio_modepin.c
| 3 +
drivers/mmc/zynq_sdhci.c
| 2 +-
drivers/mtd/spi/spi-nor-ids.c
| 68 ++
drivers/net/zynq_gem.c
| 42 +-
drivers/soc/soc_xilinx_zynqmp.c
| 2 +-
include/configs/xilinx_versal_mini_qspi.h
| 15 -
include/configs/xilinx_zynqmp_mini_emmc.h
| 15 -
include/configs/xilinx_zynqmp_mini_qspi.h
| 15 -

  58 files changed, 1446 insertions(+), 1026 deletions(-)

delete mode 100644 arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts delete mode 100644 arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi create mode 100644 arch/arm/dts/zynqmp-sm-k24-revA.dts
create mode 100644 arch/arm/dts/zynqmp-smk-k24-revA.dts
delete mode 100644
board/xilinx/zynqmp/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0/psu_init_gpl.c
create mode 100644 board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c create mode 120000 board/xilinx/zynqmp/zynqmp-smk-k24-revA
delete mode 100644 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig delete mode 100644 include/configs/xilinx_versal_mini_qspi.h
delete mode 100644 include/configs/xilinx_zynqmp_mini_emmc.h
delete mode 100644 include/configs/xilinx_zynqmp_mini_qspi.h

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/Versal ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs
#1 lore raw
Quoted 187 lines · Michal Simek

Hi Tom,

please pull these patches to your tree. Buildman doesn't show any issue and CI looks also good.
https://source.denx.de/u-boot/custodians/u-boot-microblaze/-/commit/f0f86d39fec73479d4904e6d5b9db01a29597d58

Thanks,
Michal

The following changes since commit 7b84c973b96775576dcff228d865e8570be26c82:

   ns16650: Correct CONFIG_SYS_NS16550_MEM32 platforms (2023-01-09 11:30:49 -0500)

are available in the Git repository at:

[email protected]:u-boot/custodians/u-boot-microblaze.git
tags/xilinx-for-v2023.04-rc1

for you to fetch changes up to f0f86d39fec73479d4904e6d5b9db01a29597d58:

fru: ops: Display FRU fields properly for 0xc1 fields (2023-01-27
08:49:24 +0100)

----------------------------------------------------------------
Xilinx chnages for v2023.04-rc1

makefile:
- Add multi_dtb_fit dependency

clk:
- Handle error cases

microblaze:
- Disable falcon mode and cleanup code around

xilinx:
- Enable regular expression matching in board_fit_config_name_match()
- Fix FRU handling for 0xC1 format
- Fix Xilinx legacy format eeprom parsing

zynqmp:
- Some DT updates/cleanups
- Fix IDcode for xck24
- Remove empty mini config files
- Add support for k24

versal:
- Remove empty mini config files

versal_net:
- Setup timer when runs in EL3
- Build u-boot.elf for mini configurations

zynq-gem:
- Add support for new compatible strings
- Remove support for Avnet Ultrazedev SOM
- Handle SGMII with PCS phy

spi:
- Add support for gigadevice parts

misc:
- Remove CONFIG_TARGET_VENUS ifdef
- Add missing headers to remove sparse warnings

----------------------------------------------------------------
Algapally Santosh Sagar (5):
xilinx: common: Include header file to fix warning
gpio: zynqmp: Handle error from get_gpio_modepin
xilinx: versal: Add missing header
drivers: mmc: Change datatype of tuning_loop_counter to int
fru: ops: Display FRU fields properly for 0xc1 fields

Ashok Reddy Soma (1):
xilinx: versal-net: Add support for timer and start it

Harini Katakam (2):
arm64: zynqmp: Describe TI phy as ethernet phy ID on ZCU102 RevB & up
arm64: zynqmp: Enable TI phy reset via GPIO

Jay Buddhabhatti (1):
clk: versal: Return error in case if clock setup failed

Luca Ceresoli (1):
arm64: zynqmp: remove Avnet UltraZed-EV Starter Kit

Michal Simek (19):
arm64: zynqmp: Sync #dma-cells property location
arm64: zynqmp: Added GEM reset definitions
arm64: zynqmp: Fix AMS device tree node
arm64: zynqmp: Align gpio-key node names with dtschema
arm64: zynqmp: Remove id from usb node name
net: zynq_gem: Add support for new compatible str with xlnx prefix
arm64: zynqmp: Remove unused USB DT properties
arm64: zynqmp: Remove unused snps,refclk_fladj property
board: presidio-asic: Remove CONFIG_TARGET_VENUS
xilinx: common: Add support for partial string match in
board_fit_config_name_match()
soc: zynqmp: Fix IDcode for xck24
arm64: zynqmp: Remove xilinx_zynqmp_mini_emmc/qspi.h configs arm64: versal: Remove xilinx_versal_mini_qspi.h configs
arm64: zynqmp: Fill model name for SOM CCs
arm64: zynqmp: Add support for Kria K24 SOM
arm64: versal-net: Enable remaking ELF from bin
xilinx: board: Use ETH_ALEN macro for mac address size
xilinx: board: Fix xilinx_eeprom_legacy_cleanup()
xilinx: board: Update logic in xilinx_read_eeprom_legacy

Neal Frager (1):
makefile: add multi_dtb_fit dep

Ovidiu Panait (3):
microblaze: spl: wrap spl_start_uboot() in SPL_OS_BOOT ifdefs
microblaze: spl: drop boot_linux
microblaze: spl: disable falcon mode by default

Stefan Roese (1):
net: zynq_gem: Wait for SGMII PCS link in zynq_gem_init()

Victor Lim (4):
mtd: spi-nor-ids: add gigadevice part #
configs: zynq: enable gigadevice
arm64: zynqmp: enable gigadevice
xilinx: versal: enable gigadevice

  Makefile   |    1 +
  arch/arm/dts/Makefile   |    3 +-
  arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts   |   59 --
  arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi   |   56 --
  arch/arm/dts/zynqmp-dlc21-revA.dts   |    4 -
  arch/arm/dts/zynqmp-g-a2197-00-revA.dts   |    2 -
  arch/arm/dts/zynqmp-m-a2197-01-revA.dts   |    4 -
  arch/arm/dts/zynqmp-m-a2197-02-revA.dts   |    4 -
  arch/arm/dts/zynqmp-m-a2197-03-revA.dts   |    4 -
  arch/arm/dts/zynqmp-p-a2197-00-revA.dts   |    4 -
  arch/arm/dts/zynqmp-sck-kr-g-revA.dts   |    1 +
  arch/arm/dts/zynqmp-sck-kr-g-revB.dts   |    1 +
  arch/arm/dts/zynqmp-sck-kv-g-revA.dts   |    1 +
  arch/arm/dts/zynqmp-sck-kv-g-revB.dts   |    1 +
  arch/arm/dts/zynqmp-sm-k24-revA.dts   |   22 +
  arch/arm/dts/zynqmp-sm-k26-revA.dts   |    2 +-
  arch/arm/dts/zynqmp-smk-k24-revA.dts   |   21 +
  arch/arm/dts/zynqmp-zcu100-revC.dts   |    2 +-
  arch/arm/dts/zynqmp-zcu102-revA.dts   |    2 +-
  arch/arm/dts/zynqmp-zcu102-revB.dts   |   22 +-
  arch/arm/dts/zynqmp-zcu106-revA.dts   |    2 +-
  arch/arm/dts/zynqmp-zcu111-revA.dts   |    2 +-
  arch/arm/dts/zynqmp.dtsi   |   58 +-
  arch/arm/mach-versal-net/Kconfig   |   12 +
  arch/arm/mach-versal-net/include/mach/hardware.h   |   30 +
  arch/microblaze/cpu/spl.c   |   11 +-
  board/cortina/presidio-asic/lowlevel_init.S   |    2 -
  board/xilinx/common/board.c   |   57 +-
  board/xilinx/common/fru_ops.c   |   43 +-
  board/xilinx/versal-net/board.c   |   41 +
  board/xilinx/versal/board.c   |    1 +
  board/xilinx/zynqmp/MAINTAINERS   |    6 -

board/xilinx/zynqmp/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0/psu_init_gpl.c | 655 ------------

  board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c   | 1061
++++++++++++++++++++
  board/xilinx/zynqmp/zynqmp-smk-k24-revA   |    1 +
  configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig   |   83 --
  configs/microblaze-generic_defconfig   |    3 -
  configs/xilinx_versal_mini_defconfig   |    2 +-
  configs/xilinx_versal_mini_ospi_defconfig   |    2 +-
  configs/xilinx_versal_mini_qspi_defconfig   |    3 +-
  configs/xilinx_versal_net_mini_defconfig   |    2 +
  configs/xilinx_versal_net_virt_defconfig   |    1 +
  configs/xilinx_zynq_virt_defconfig   |    1 +
  configs/xilinx_zynqmp_mini_defconfig   |    2 +-
  configs/xilinx_zynqmp_mini_emmc0_defconfig   |    2 +-
  configs/xilinx_zynqmp_mini_emmc1_defconfig   |    2 +-
  configs/xilinx_zynqmp_mini_qspi_defconfig   |    3 +-
  configs/xilinx_zynqmp_virt_defconfig   |    1 +
  configs/zynq_cse_qspi_defconfig   |    1 +
  drivers/clk/clk_versal.c   |    4 +-
  drivers/gpio/zynqmp_gpio_modepin.c   |    3 +
  drivers/mmc/zynq_sdhci.c   |    2 +-
  drivers/mtd/spi/spi-nor-ids.c   |   68 ++
  drivers/net/zynq_gem.c   |   42 +-
  drivers/soc/soc_xilinx_zynqmp.c   |    2 +-
  include/configs/xilinx_versal_mini_qspi.h   |   15 -
  include/configs/xilinx_zynqmp_mini_emmc.h   |   15 -
  include/configs/xilinx_zynqmp_mini_qspi.h   |   15 -
  58 files changed, 1446 insertions(+), 1026 deletions(-)
Quoted 11 lines

delete mode 100644 arch/arm/dts/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0.dts delete mode 100644 arch/arm/dts/avnet-ultrazedev-som-v1.0.dtsi
create mode 100644 arch/arm/dts/zynqmp-sm-k24-revA.dts
create mode 100644 arch/arm/dts/zynqmp-smk-k24-revA.dts
delete mode 100644 board/xilinx/zynqmp/avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0/psu_init_gpl.c create mode 100644 board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c
create mode 120000 board/xilinx/zynqmp/zynqmp-smk-k24-revA
delete mode 100644 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig delete mode 100644 include/configs/xilinx_versal_mini_qspi.h
delete mode 100644 include/configs/xilinx_zynqmp_mini_emmc.h
delete mode 100644 include/configs/xilinx_zynqmp_mini_qspi.h

Applied to u-boot/master, thanks!

Signature · 1 line
Tom