June 2021 - U-Boot

Please pull u-boot-marvell/master
by Stefan Roese 10 Jun '21

10 Jun '21

Hi Tom, please pull the next batch of Marvell Armada related patches: ---------------------------------------------------------------- - mvebu: Turris MOX misc updates (cmds, rescue mode, LED's etc) (Marek) - mvebu: correct Armada 8K addresses (Heinrich) ---------------------------------------------------------------- Here the Azure build without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=94&view=results Thanks, Stefan The following changes since commit 0008d8086649d3bb3afd0c4697f5b73ccf6f293d: fs/squashfs: fix reading of fragmented files (2021-06-09 20:58:20 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to c64e2bd55883ede3dc29421f1f297d741ae5b137: arm64: mvebu: correct Armada 8K addresses (2021-06-10 07:18:06 +0200) ---------------------------------------------------------------- Heinrich Schuchardt (1): arm64: mvebu: correct Armada 8K addresses Marek Behún (6): arm: mvebu: dts: turris_mox: add button and LED nodes arm: mvebu: turris_mox: add support for board rescue mode arm: mvebu: turris_mox: start blinking PHY LEDs when entering rescue arm: mvebu: configs: turris_mox: add fdtfile default env variable arm: mvebu: dts: turris_mox: add nodes for SPI NOR partitions arm: mvebu: turris_mox: enable options for Turris network boot arch/arm/dts/armada-3720-turris-mox.dts | 55 +++++++++++++++++ board/CZ.NIC/turris_mox/turris_mox.c | 106 ++++++++++++++++++++++++++++++++ configs/turris_mox_defconfig | 14 +++++ include/configs/mvebu_armada-8k.h | 10 +-- include/configs/turris_mox.h | 10 +++ 5 files changed, 190 insertions(+), 5 deletions(-)

2 1

[GIT PULL] TI changes for v2021.10 next
by Lokesh Vutla 10 Jun '21

10 Jun '21

Hi Tom, Please find the PR for master branch targeted for v2021.10-next branch. Details about the PR are updated in the tag message. Gitlab CI report: https://source.denx.de/u-boot/custodians/u-boot-ti/-/pipelines/7780 The following changes since commit e8f720ee1707b43a0e14ade87b40a1f84baeb2f3: Merge branch '2021-06-08-kconfig-migrations' into next (2021-06-09 08:19:13 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2021.10-next for you to fetch changes up to 47a10af8f8a90b3d9e83fafb51372800171344a9: dma: ti: k3-udma: Add support for native configuration of chan/flow (2021-06-09 22:23:45 +0530) ---------------------------------------------------------------- - HSM re-architecture support for all K3 platforms - AM64 USB support - Driver model support for Davinci RTC ---------------------------------------------------------------- Aswath Govindraju (10): tools: k3_fit_atf: Add support for providing ATF load address using a Kconfig symbol arm: mach-k3: am642_init: Add support for USB boot mode arm: mach-k3: am642_init: Do USB fixups to facilitate host and device boot modes board: ti: am64x: Set the core voltage of USB PHY to 0.85V arm: dts: k3-am64-main: Add USB DT nodes arm: dts: k3-am642-*-evm: Add USB support arm: dts: k3-am642-evm-u-boot: Add U-Boot tags and fix the dr_mode to peripheral for USB subsystem configs: am64x_evm_*_defconfig: Rearrange the components in SRAM to satisfy the limitations for USB DFU boot mode arm: dts: k3-am64-main: Update the location of ATF in SRAM and increase its max size configs: am64: Enable configs to support USB host and device modes Dario Binacchi (8): rtc: davinci: enable compilation for omap architectures rtc: davinci: fix compiler errors rtc: davinci: replace 32bit access with 8bit access rtc: davinci: check BUSY bit before set TC registers rtc: davinci: use unlock/lock mechanism arm: dts: sync rtc node of am335x boards with Linux 5.9-rc7 rtc: davinci: add driver model support rtc: davinci: fix date loaded on reset Dave Gerlach (4): arm: mach-k3: Add platform data for j721e and j7200 arm: mach-k3: common: Drop main r5 start arm: mach-k3: j721e_init: Force early probe of clk-k3 driver configs: j7200_evm_r5: Enable raw access power management features Kevin Scholz (1): arm: dts: k3-j7200: ddr: Update to 0.5.0 version of DDR for LPDDR 2666MTs Lokesh Vutla (1): common: fit: Update board_fit_image_post_process() to pass fit and node_offset Pali Rohár (1): Nokia RX-51: Enable CONFIG_WDT to remove deprecation warning Tero Kristo (21): lib: rational: copy the rational fraction lib routines from Linux arm: mach-k3: introduce new config option for sysfw split remoteproc: k3-r5: remove sysfw PM calls if not supported clk: fixed_rate: add API for directly registering fixed rate clocks clk: fix clock tree dump to properly dump out every registered clock clk: do not attempt to fetch clock pointer with null device clk: add support for setting clk rate from cmdline clk: sci-clk: fix return value of set_rate clk: fix assigned-clocks to pass with deferring provider clk: fix set_rate to clean up cached rates for the hierarchy clk: add support for TI K3 SoC PLL clk: add support for TI K3 SoC clocks power: domain: Introduce driver for raw TI K3 PDs cmd: ti: pd: Add debug command for K3 power domains tools: k3_fit_atf: add DM binary to the FIT image arm: mach-k3: add support for detecting firmware images from FIT arm: mach-k3: do board config for PM only if supported arm: mach-k3: sysfw-loader: pass boardcfg to sciserver configs: j721e_evm_r5: Enable raw access power management features board: ti: j72xx: README: update build instructions and image formats arm: dts: k3-j72xx: correct MCU timer1 frequency Vignesh Raghavendra (7): mailbox: k3-sec-proxy: Add DM to DMSC communication thread firmware: ti_sci: Implement GET_RANGE with static data firmware: ti_sci: Add support for Resoure Management at R5 SPL stage. ARM: dts: j72xx-r5-common-proc-board: Add DM firmware node ARM: dts: k3: Add cfg register space for ringacc and udmap soc: ti: k3-navss-ringacc: Add support for native configuration of rings dma: ti: k3-udma: Add support for native configuration of chan/flow arch/arm/dts/am335x-bone-common.dtsi | 5 + arch/arm/dts/am335x-evm.dts | 5 + arch/arm/dts/am335x-evmsk.dts | 5 + arch/arm/dts/am335x-osd335x-common.dtsi | 6 + arch/arm/dts/k3-am64-main.dtsi | 32 +- arch/arm/dts/k3-am642-evm-u-boot.dtsi | 13 + arch/arm/dts/k3-am642-evm.dts | 18 + arch/arm/dts/k3-am642-r5-evm.dts | 18 + arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 14 + .../k3-j7200-common-proc-board-u-boot.dtsi | 30 +- ...00.dtsi => k3-j7200-ddr-evm-lp4-2666.dtsi} | 437 +++++----- .../arm/dts/k3-j7200-r5-common-proc-board.dts | 19 +- .../k3-j721e-common-proc-board-u-boot.dtsi | 16 +- .../arm/dts/k3-j721e-r5-common-proc-board.dts | 18 + arch/arm/mach-k3/Kconfig | 18 + arch/arm/mach-k3/Makefile | 2 +- arch/arm/mach-k3/am642_init.c | 46 +- arch/arm/mach-k3/common.c | 85 +- arch/arm/mach-k3/common.h | 1 + arch/arm/mach-k3/config.mk | 5 + arch/arm/mach-k3/include/mach/am64_hardware.h | 11 +- arch/arm/mach-k3/include/mach/am64_spl.h | 6 +- arch/arm/mach-k3/j7200/Makefile | 5 + arch/arm/mach-k3/j7200/clk-data.c | 547 ++++++++++++ arch/arm/mach-k3/j7200/dev-data.c | 77 ++ arch/arm/mach-k3/j721e/Makefile | 5 + arch/arm/mach-k3/j721e/clk-data.c | 781 ++++++++++++++++++ arch/arm/mach-k3/j721e/dev-data.c | 75 ++ arch/arm/mach-k3/j721e_init.c | 12 + arch/arm/mach-k3/security.c | 2 +- arch/arm/mach-k3/sysfw-loader.c | 105 +++ arch/arm/mach-keystone/mon.c | 3 +- arch/arm/mach-socfpga/board.c | 3 +- board/nokia/rx51/rx51.c | 37 +- board/ti/am335x/board.c | 3 +- board/ti/am43xx/board.c | 3 +- board/ti/am57xx/board.c | 3 +- board/ti/am64x/evm.c | 14 + board/ti/dra7xx/evm.c | 3 +- board/ti/j721e/README | 9 +- cmd/clk.c | 80 +- cmd/ti/Kconfig | 8 + cmd/ti/Makefile | 1 + cmd/ti/pd.c | 185 +++++ common/image-fit.c | 2 +- common/spl/spl_fit.c | 2 +- configs/am64x_evm_a53_defconfig | 40 + configs/am64x_evm_r5_defconfig | 38 +- configs/j7200_evm_r5_defconfig | 14 +- configs/j721e_evm_r5_defconfig | 12 +- configs/nokia_rx51_defconfig | 2 + .../firmware/ti,j721e-dm-sci.txt | 32 + drivers/clk/clk-uclass.c | 39 + drivers/clk/clk_fixed_rate.c | 45 + drivers/clk/ti/Kconfig | 24 + drivers/clk/ti/Makefile | 2 + drivers/clk/ti/clk-k3-pll.c | 283 +++++++ drivers/clk/ti/clk-k3.c | 374 +++++++++ drivers/clk/ti/clk-sci.c | 6 +- drivers/dma/ti/k3-udma-u-boot.c | 177 ++++ drivers/dma/ti/k3-udma.c | 42 +- drivers/firmware/ti_sci.c | 107 +++ drivers/firmware/ti_sci_static_data.h | 92 +++ drivers/mailbox/k3-sec-proxy.c | 2 +- drivers/power/domain/Kconfig | 7 + drivers/power/domain/Makefile | 1 + drivers/power/domain/ti-power-domain.c | 368 +++++++++ drivers/remoteproc/ti_k3_r5f_rproc.c | 9 + drivers/rtc/Kconfig | 7 + drivers/rtc/davinci.c | 460 +++++++++-- drivers/soc/ti/k3-navss-ringacc-u-boot.c | 61 ++ drivers/soc/ti/k3-navss-ringacc.c | 36 +- include/configs/am64x_evm.h | 15 +- include/configs/nokia_rx51.h | 3 - include/image.h | 5 +- include/k3-clk.h | 177 ++++ include/k3-dev.h | 85 ++ include/linux/clk-provider.h | 3 + include/linux/rational.h | 20 + lib/Kconfig | 7 + lib/Makefile | 2 + lib/rational.c | 99 +++ tools/k3_fit_atf.sh | 28 +- 83 files changed, 5158 insertions(+), 341 deletions(-) rename arch/arm/dts/{k3-j7200-ddr-evm-lp4-1600.dtsi => k3-j7200-ddr-evm-lp4-2666.dtsi} (90%) create mode 100644 arch/arm/mach-k3/j7200/Makefile create mode 100644 arch/arm/mach-k3/j7200/clk-data.c create mode 100644 arch/arm/mach-k3/j7200/dev-data.c create mode 100644 arch/arm/mach-k3/j721e/Makefile create mode 100644 arch/arm/mach-k3/j721e/clk-data.c create mode 100644 arch/arm/mach-k3/j721e/dev-data.c create mode 100644 cmd/ti/pd.c create mode 100644 doc/device-tree-bindings/firmware/ti,j721e-dm-sci.txt create mode 100644 drivers/clk/ti/clk-k3-pll.c create mode 100644 drivers/clk/ti/clk-k3.c create mode 100644 drivers/dma/ti/k3-udma-u-boot.c create mode 100644 drivers/firmware/ti_sci_static_data.h create mode 100644 drivers/power/domain/ti-power-domain.c create mode 100644 drivers/soc/ti/k3-navss-ringacc-u-boot.c create mode 100644 include/k3-clk.h create mode 100644 include/k3-dev.h create mode 100644 include/linux/rational.h create mode 100644 lib/rational.c -- 2.30.0

3 3

[PATCH v5 0/2] Add Xilinx clock wizard driver support
by Zhengxun 10 Jun '21

10 Jun '21

Add support to enable clock wizard for zynq platform. Changes in v5: - add devicetree binding - use FIELD_PREP and FIELD_GET - use clk_get_by_name() - add clk_free() Changes in v4: - rearrange functions - remove Superfluous words - check kernel-doc comments Changes in v3: - remove incorrect usage in of_to_plat - get frequencies via clock framework - delete incorrect naming Changes in v2: - naming is aligned with linux - delete inappropriate description and code Zhengxun (2): clk: zynq: Add clock wizard driver dt-bindings: add xilinx clocking wizard bindings .../clock/xlnx,clocking-wizard.txt | 43 ++++ drivers/clk/Kconfig | 9 + drivers/clk/Makefile | 1 + drivers/clk/clk-xlnx-clock-wizard.c | 186 ++++++++++++++++++ 4 files changed, 239 insertions(+) create mode 100644 doc/device-tree-bindings/clock/xlnx,clocking-wizard.txt create mode 100644 drivers/clk/clk-xlnx-clock-wizard.c -- 2.17.1

3 5

[PATCH] env: Leave invalid env for nowhere location
by Kunihiko Hayashi 10 Jun '21

10 Jun '21

When CONFIG_ENV_IS_NOWHERE is enabled, env_nowhere_init() sets ENV_INVALID to gd->env_valid, and sets default_environment before relocation to gd->env_addr. After that, env_init() switches gd->env_valid to ENV_VALID by the previous fix. If gd->env_valid is ENV_INVALID, env_get_char() returns relocated default_environment, however, env_get_char() returns gd->env_addr before relocation since gd->env_valid is ENV_VALID, and access to gd->env_addr will cause a fault. This leaves gd->env_valid as ENV_INVALID for "nowhere" location. Cc: Marek Vasut <marex(a)denx.de> Fixes: 5557eec01cbf ("env: Fix invalid env handling in env_init()") Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> --- env/env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/env/env.c b/env/env.c index e534008..3233172 100644 --- a/env/env.c +++ b/env/env.c @@ -336,7 +336,8 @@ int env_init(void) debug("%s: Environment %s init done (ret=%d)\n", __func__, drv->name, ret); - if (gd->env_valid == ENV_INVALID) + if (gd->env_valid == ENV_INVALID + && drv->location != ENVL_NOWHERE) ret = -ENOENT; } -- 2.7.4

2 11

[PATCH 1/1] arm64: mvebu: correct Armada 8K addresses
by Heinrich Schuchardt 10 Jun '21

10 Jun '21

0x04000000- 0x06000000 is reserved memory. We cannot load to anything here. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/configs/mvebu_armada-8k.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 38f50468c5..493e3de9b9 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -91,11 +91,11 @@ #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ - "scriptaddr=0x4d00000\0" \ - "pxefile_addr_r=0x4e00000\0" \ - "fdt_addr_r=0x4f00000\0" \ - "kernel_addr_r=0x5000000\0" \ - "ramdisk_addr_r=0x8000000\0" \ + "scriptaddr=0x6d00000\0" \ + "pxefile_addr_r=0x6e00000\0" \ + "fdt_addr_r=0x6f00000\0" \ + "kernel_addr_r=0x7000000\0" \ + "ramdisk_addr_r=0xa000000\0" \ "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ BOOTENV -- 2.32.0

2 2

[PATCH] zynqmp: Remove u-boot,dm-pre-reloc for uart instances
by Michal Simek 10 Jun '21

10 Jun '21

Uarts already have u-boot,dm-pre-reloc via zynqmp.dtsi that's why there is no need to have them in platform DT files too. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/dts/zynqmp-a2197-revA.dts | 1 - arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 1 - arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 1 - arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 2 -- arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 2 -- arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 2 -- arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 2 -- 7 files changed, 11 deletions(-) diff --git a/arch/arm/dts/zynqmp-a2197-revA.dts b/arch/arm/dts/zynqmp-a2197-revA.dts index 315313854254..27a9c60949a7 100644 --- a/arch/arm/dts/zynqmp-a2197-revA.dts +++ b/arch/arm/dts/zynqmp-a2197-revA.dts @@ -35,7 +35,6 @@ &uart0 { /* uart0 MIO38-39 */ status = "okay"; - u-boot,dm-pre-reloc; }; &i2c0 { diff --git a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts index 8ec2e866535b..7bcdbdfdbb06 100644 --- a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts +++ b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts @@ -124,7 +124,6 @@ &uart0 { /* uart0 MIO38-39 */ status = "okay"; - u-boot,dm-pre-reloc; }; &sdhci1 { /* sd1 MIO45-51 cd in place */ diff --git a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts index f94b797d1a24..69a3901ccf6c 100644 --- a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts +++ b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts @@ -75,7 +75,6 @@ &uart0 { /* uart0 MIO38-39 */ status = "okay"; - u-boot,dm-pre-reloc; }; &gem0 { /* eth MDIO 76/77 */ diff --git a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts index 213149a3dc83..a5db599c9497 100644 --- a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts @@ -94,12 +94,10 @@ &uart0 { /* uart0 MIO38-39 */ status = "okay"; - u-boot,dm-pre-reloc; }; &uart1 { /* uart1 MIO40-41 */ status = "okay"; - u-boot,dm-pre-reloc; }; &sdhci1 { /* sd1 MIO45-51 cd in place */ diff --git a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts index c458110e5a89..58df328c987f 100644 --- a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts @@ -90,12 +90,10 @@ &uart0 { /* uart0 MIO38-39 */ status = "okay"; - u-boot,dm-pre-reloc; }; &uart1 { /* uart1 MIO40-41 */ status = "okay"; - u-boot,dm-pre-reloc; }; &sdhci1 { /* sd1 MIO45-51 cd in place */ diff --git a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts index cee7ca1fa995..25d87532be77 100644 --- a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts +++ b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts @@ -90,12 +90,10 @@ &uart0 { /* uart0 MIO38-39 */ status = "okay"; - u-boot,dm-pre-reloc; }; &uart1 { /* uart1 MIO40-41 */ status = "okay"; - u-boot,dm-pre-reloc; }; &sdhci1 { /* sd1 MIO45-51 cd in place */ diff --git a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts index 1f5201ac8883..82d5ef83f764 100644 --- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts +++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts @@ -68,12 +68,10 @@ &uart0 { /* uart0 MIO38-39 */ status = "okay"; - u-boot,dm-pre-reloc; }; &uart1 { /* uart1 MIO40-41 */ status = "okay"; - u-boot,dm-pre-reloc; }; &sdhci1 { /* sd1 MIO45-51 cd in place */ -- 2.31.1

2 1

[PATCH 0/3] zynqmp: Add support for secure OS loading
by Michal Simek 10 Jun '21

10 Jun '21

Hi, this series is adding support for working with TEE in much easier and flexible way. TF-A can be placed to any location. When it is placed to DDR you should enable DT support which reserve location where TF-A is https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/10131 The similar DT support can be added to secure OS but I haven't sent that patches out in OPTEE case yet. Thanks, Michal Michal Simek (3): zynqmp: Do not place u-boot to reserved memory location zynqmp: Generate u-boot.its also with TEE dynamically zynqmp: Pass bl32 entry to TF-A via xilinx handoff structure arch/arm/mach-zynqmp/handoff.c | 19 +++++++++--- arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 41 ++++++++++++++++++++++++- board/xilinx/zynqmp/zynqmp.c | 21 +++++++++++++ 3 files changed, 75 insertions(+), 6 deletions(-) -- 2.31.1

2 4

[PATCH] zynqmp: Enable regulators
by Michal Simek 10 Jun '21

10 Jun '21

Enable command and fixed regulators. XDP platform is using them. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/xilinx_zynqmp_virt_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 1df0ef66c22c..8191b7f73c67 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -61,6 +61,7 @@ CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y CONFIG_CMD_GETTIME=y CONFIG_CMD_TIMER=y +CONFIG_CMD_REGULATOR=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y @@ -142,6 +143,8 @@ CONFIG_PHY_XILINX_GMII2RGMII=y CONFIG_PHY_FIXED=y CONFIG_XILINX_AXIEMAC=y CONFIG_ZYNQ_GEM=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_RTC=y CONFIG_RTC_EMULATION=y CONFIG_SCSI=y -- 2.31.1

2 1

[PATCH 0/7] arm64: zynqmp: DT syncup
by Michal Simek 10 Jun '21

10 Jun '21

Hi, I am sending this series to align DT files with the latest description. Couple of changes are taken from Linux kernel and others from Xilinx trees. Thanks, Michal Michal Simek (6): arm64: zynqmp: Update psgtr clocks index for boards arm64: zynqmp: Disable CCI by default arm64: zynqmp: Add reset description for sata arm64: zynqmp: Move DP nodes to the end of file (zcu106) arm64: zynqmp: Add label for zynqmp_ipi arm64: zynqmp: Update Copyright years to 2021 Stefano Stabellini (1): arm64: zynqmp: Add missing SMID for pcie to zynqmp.dtsi arch/arm/dts/zynqmp-zc1232-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 20 ++++++------- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 38 ++++++++++++------------ arch/arm/dts/zynqmp-zcu111-revA.dts | 16 +++++----- arch/arm/dts/zynqmp-zcu1275-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu1275-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu1285-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 8 ++--- arch/arm/dts/zynqmp-zcu216-revA.dts | 8 ++--- arch/arm/dts/zynqmp.dtsi | 8 +++-- 16 files changed, 61 insertions(+), 57 deletions(-) -- 2.31.1

2 8

[PATCH] arm64: zynqmp: Handle MMC seq number based on boot device
by Michal Simek 10 Jun '21

10 Jun '21

K26 has EMMC and SD and default 0 is not working when system is booting out of SD which is controller 1. Add controller autodetection via mmc_get_env_dev(). The same code is used for distro_boot selection done in board_late_init(). bootseq variable can't be reused because this is called so late. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynqmp/zynqmp.c | 35 ++++++++++++++++++++++++++++ configs/xilinx_zynqmp_virt_defconfig | 1 + 2 files changed, 36 insertions(+) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 6e353e3b0a57..46dee80470fa 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -709,6 +709,41 @@ int checkboard(void) return 0; } +int mmc_get_env_dev(void) +{ + struct udevice *dev; + int bootseq = 0; + + switch (zynqmp_get_bootmode()) { + case EMMC_MODE: + case SD_MODE: + if (uclass_get_device_by_name(UCLASS_MMC, + "mmc@ff160000", &dev) && + uclass_get_device_by_name(UCLASS_MMC, + "sdhci@ff160000", &dev)) { + return -1; + } + bootseq = dev_seq(dev); + break; + case SD1_LSHFT_MODE: + case SD_MODE1: + if (uclass_get_device_by_name(UCLASS_MMC, + "mmc@ff170000", &dev) && + uclass_get_device_by_name(UCLASS_MMC, + "sdhci@ff170000", &dev)) { + return -1; + } + bootseq = dev_seq(dev); + break; + default: + break; + } + + debug("bootseq %d\n", bootseq); + + return bootseq; +} + enum env_location env_get_location(enum env_operation op, int prio) { u32 bootmode = zynqmp_get_bootmode(); diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index ece527e07468..1df0ef66c22c 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -76,6 +76,7 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_ENV_FAT_DEVICE_AND_PART=":auto" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y -- 2.31.1

2 1