September 2021 - U-Boot

[PATCH v5 0/4] riscv: enable SBI system reset
by Heinrich Schuchardt 12 Sep '21

12 Sep '21

With SBI v0.3 a system reset extension is available. This allows to implement reboot and poweroff in U-Boot in a system independent way. * Provide missing constants * Provide a system reset driver using the system reset extension. v5: * add a configuration actually using the driver * don't add __efi_runtime in arch/riscv/lib/sbi.c * use '=' not ':' in array initialization with enum indices v4: * remove the UEFI SystemReset() implementation * simplify the code using an array to translate reset types * remove a superfluos check to determine if the device was probed v3: add SBI_HSM_HART_STATUS_SUSPENDED, SBI_HSM_HART_STATUS_SUSPEND_PENDING, SBI_HSM_HART_STATUS_RESUME_PENDING v2: correct constants that were blindly copied from Linux Heinrich Schuchardt (4): riscv: add missing SBI extension definitions cmd/sbi: use constants instead of numerical values sysreset: provide SBI based sysreset driver configs: enable SYSRESET_SBI on qemu-riscvXX_smode_defconfig MAINTAINERS | 1 + arch/riscv/cpu/cpu.c | 13 ++++++- arch/riscv/include/asm/sbi.h | 40 ++++++++++++++++++++-- arch/riscv/lib/sbi.c | 12 +++++++ cmd/riscv/sbi.c | 30 ++++++++-------- configs/qemu-riscv32_smode_defconfig | 1 + configs/qemu-riscv64_smode_defconfig | 1 + drivers/sysreset/Kconfig | 12 +++++++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_sbi.c | 51 ++++++++++++++++++++++++++++ 10 files changed, 144 insertions(+), 18 deletions(-) create mode 100644 drivers/sysreset/sysreset_sbi.c -- 2.30.2

3 7

Watchdog auto-start and TIMER_EARLY broken in RISC-V U-Boot
by Samuel Holland 11 Sep '21

11 Sep '21

Hello, I am porting U-Boot to the Allwinner D1 SoC, and I ran into an issue where the board fails to boot if I enable watchdog auto-start. The call to get_timer() -> get_ticks() panics because no timer is available. And since panic_finish() calls udelay(), this causes infinite recursion of trying and failing to get the timer. The issue is that the RISC-V architectural timer driver is bound in arch_early_init_r, which is only called _after_ the first instance of INIT_FUNC_WATCHDOG_RESET in the initcall list. Below is a boot log where I commented out the calls to get_timer() and time_after_eq() in watchdog_reset() in order to illustrate the problem. I modified the log to add the initcall symbol names for clarity. > U-Boot 2021.10-rc2-00278-ge2be1a426d6-dirty (Jan 01 1970 - 00:00:00 +0000) > > DRAM: 512 MiB > initcall: 000000005ff63916 > initcall: 000000005ff6391a > initcall: 000000004a012a4e (initr_reloc_global_data) > initcall: 000000004a012a88 (initr_barrier) > initcall: 000000004a012a1c (initr_malloc) > Pre-reloc malloc() used 0x720 bytes (1 KB) > initcall: 000000004a01290e (log_init) > initcall: 000000004a012a94 (initr_bootstage) > initcall: 000000004a012a8c (initr_of_live) > initcall: 000000004a012a06 (initr_dm) > Binding device root_driver to driver root_driver > Probing device root_driver with driver root_driver > Binding device osc24M_clk to driver fixed_clock > Binding device soc to driver simple_bus > Binding device pinctrl@2000000 to driver sunxi-pinctrl > Binding device pinctrl@2000000 to driver gpio_sunxi > Binding device PA to driver gpio_sunxi > Binding device PB to driver gpio_sunxi > Binding device PC to driver gpio_sunxi > Binding device PD to driver gpio_sunxi > Binding device PE to driver gpio_sunxi > Binding device PF to driver gpio_sunxi > Binding device PG to driver gpio_sunxi > Binding device i2c0-pb10-pins to driver pinconfig > Binding device i2c2-pb0-pins to driver pinconfig > Binding device mmc0-pins to driver pinconfig > Binding device mmc1-pins to driver pinconfig > Binding device rgmii-pe-pins to driver pinconfig > Binding device spi0-pins to driver pinconfig > Binding device spi1-pd-pins to driver pinconfig > Binding device uart0-pb8-pins to driver pinconfig > Binding device uart1-pg6-pins to driver pinconfig > Binding device uart1-pg8-rts-cts-pins to driver pinconfig > Binding device i2s2-pb-pins to driver pinconfig > Binding device i2s2-pb3-din-pin to driver pinconfig > Binding device i2s2-pb4-dout-pin to driver pinconfig > Binding device ledc-pc0-pin to driver pinconfig > Binding device pwm0-pd16-pin to driver pinconfig > Binding device pwm2-pd18-pin to driver pinconfig > Binding device pwm7-pd22-pin to driver pinconfig > Binding device spdif-pd22-pin to driver pinconfig > Binding device clock-controller@2001000 to driver sun50i_d1_ccu > Binding device reset to driver sunxi_reset > Binding device serial@2500000 to driver ns16550_serial > Binding device serial@2500400 to driver ns16550_serial > Binding device i2c@2502000 to driver i2c_mvtwsi > Binding device i2c@2502800 to driver i2c_mvtwsi > Binding device mmc@4020000 to driver sunxi_mmc > Binding device mmc(a)4020000.blk to driver mmc_blk > Binding device mmc@4021000 to driver sunxi_mmc > Binding device mmc(a)4021000.blk to driver mmc_blk > Binding device usb@4100000 to driver sunxi-musb > Binding device phy@4100400 to driver sun4i_usb_phy > Binding device usb@4101000 to driver ehci_generic > Binding device usb@4101400 to driver ohci_generic > Binding device usb@4200000 to driver ehci_generic > Binding device usb@4200400 to driver ohci_generic > Binding device ethernet@4500000 to driver eth_sun8i_emac > Binding device watchdog@6011000 to driver sunxi_wdt > initcall: 000000004a001914 (board_init) > initcall: 000000004a04d814 (efi_memory_init) > initcall: 000000004a012a9c (initr_binman) > initcall: 000000004a012a90 (initr_dm_devices) Here's where dm_timer_init() would be called if CONFIG_TIMER_EARLY was enabled, but that still doesn't help because the timer is not bound yet. In fact, CONFIG_TIMER_EARLY actually makes the situation worse, because the board hangs if dm_timer_init() fails: initcall sequence 000000005ffdac78 failed at call 000000004a012a06 (err=-19) ### ERROR ### Please RESET the board ### > initcall: 000000004a01c4f4 (stdio_init_tables) > initcall: 000000004a039ff8 (serial_initialize) > Probing device pinctrl@2000000 with driver sunxi-pinctrl > Probing device soc with driver simple_bus > Probing device clock-controller@2001000 with driver sun50i_d1_ccu > Probing device osc24M_clk with driver fixed_clock > Probing device uart0-pb8-pins with driver pinconfig > Probing device serial@2500000 with driver ns16550_serial > Probing device reset with driver sunxi_reset > initcall: 000000004a0129ea (initr_announce) > Now running in RAM - U-Boot at: 5ff51000 > initcall: 000000004a0367ce (initr_watchdog) > Probing device watchdog@6011000 with driver sunxi_wdt > WDT: Started with servicing (16s timeout) > initcall: 000000004a012610 (init_func_watchdog_reset) Here's where the timer needs to be available for watchdog auto-start to work. An unpatched U-Boot would panic here. > initcall: 000000004a012a84 (arch_initr_trap) > initcall: 000000004a012610 (init_func_watchdog_reset) > initcall: 000000004a012610 (init_func_watchdog_reset) > initcall: 000000004a000ed4 (arch_early_init_r) > Binding device cpus to driver cpu_bus > Binding device cpu@0 to driver riscv_cpu > Binding device riscv_timer to driver riscv_timer But here is where the timer device is actually bound. Do you have any suggestions for how best to fix this? Some things I can think of: - Add an option to probe the CPU device early in initr_dm_devices() - Require the board to probe the CPU device from board_init() - Move arch_early_init_r() earlier in the initcall list - Skip restarting the watchdog until a timer is available (but this would not fix CONFIG_TIMER_EARLY) Thanks, Samuel > Probing device cpus with driver cpu_bus > Probing device cpu@0 with driver riscv_cpu > Binding device sbi-sysreset to driver sbi-sysreset > initcall: 000000004a012a98 (power_init_board) > initcall: 000000004a012610 (init_func_watchdog_reset) > initcall: 000000004a0129ca (initr_mmc) > MMC: Probing device mmc0-pins with driver pinconfig > Probing device mmc@4020000 with driver sunxi_mmc > Probing device pinctrl@2000000 with driver gpio_sunxi > Probing device PF with driver gpio_sunxi > Need to init timer! > Probing device riscv_timer with driver riscv_timer > Timer is 000000005df34f80 > Read timer, got 0x17dacfb > Timer is 000000005df34f80 > Read timer, got 0x17f63b8 > Probing device mmc1-pins with driver pinconfig > Probing device mmc@4021000 with driver sunxi_mmc > Timer is 000000005df34f80 > Read timer, got 0x186be7e > Timer is 000000005df34f80 > Read timer, got 0x188752e > mmc@4020000: 0, mmc@4021000: 1 > initcall: 000000004a012970 (relocated to 000000005ff63970) > Loading Environment from nowhere... OK > initcall: 000000004a012610 (relocated to 000000005ff63610) > initcall: 000000004a012912 (relocated to 000000005ff63912) > initcall: 000000004a012610 (relocated to 000000005ff63610) > initcall: 000000004a01c50c (relocated to 000000005ff6d50c) > initcall: 000000004a010938 (relocated to 000000005ff61938) > initcall: 000000004a0188bc (relocated to 000000005ff698bc) > In: serial@2500000 > Out: serial@2500000 > Err: serial@2500000 > initcall: 000000004a012610 (relocated to 000000005ff63610) > initcall: 000000004a0012dc (relocated to 000000005ff522dc) > initcall: 000000004a012950 (relocated to 000000005ff63950) > initcall: 000000004a012610 (relocated to 000000005ff63610) > initcall: 000000004a012934 (relocated to 000000005ff63934) > Net: phy interface8 > Probing device rgmii-pe-pins with driver pinconfig > Probing device ethernet@4500000 with driver eth_sun8i_emac > Timer is 000000005df34f80 > Read timer, got 0x1ae9538 > Timer is 000000005df34f80 > Read timer, got 0x1b04bed > Timer is 000000005df34f80 > Read timer, got 0x1b202af > Timer is 000000005df34f80 > Read timer, got 0x1b3b96e > Timer is 000000005df34f80 > Read timer, got 0x1b5702c > Timer is 000000005df34f80 > Read timer, got 0x1b726ec > > Warning: ethernet@4500000 (eth0) using random MAC address - 62:69:97:68:19:04 > eth0: ethernet@4500000 > initcall: 000000004a01292a (relocated to 000000005ff6392a) > Hit any key to stop autoboot: 0

2 3

[PATCH] Dockerfile: Update to latest "focal" tag
by Tom Rini 11 Sep '21

11 Sep '21

Signed-off-by: Tom Rini <trini(a)konsulko.com> --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 0195456dfeca..42d4b0c91ac8 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:focal-20210723 +FROM ubuntu:focal-20210827 MAINTAINER Tom Rini <trini(a)konsulko.com> LABEL Description=" This image is for building U-Boot inside a container" -- 2.17.1

2 2

[PATCH] CI: Update to latest container images
by Tom Rini 11 Sep '21

11 Sep '21

- Current Ubuntu/Focal tag - QEMU 6.1.0 - genimage tool added Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 2e9c1fb4fd98..55a984f5d822 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: vs2017-win2016 ubuntu_vm: ubuntu-18.04 macos_vm: macOS-10.15 - ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20210723-04Aug2021 + ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20210827-11Sep2021 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 599de6e506bf..cfe519bb2a3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found at: # https://source.denx.de/u-boot/gitlab-ci-runner -image: trini/u-boot-gitlab-ci-runner:focal-20210723-04Aug2021 +image: trini/u-boot-gitlab-ci-runner:focal-20210827-11Sep2021 # We run some tests in different order, to catch some failures quicker. stages: -- 2.17.1

2 2

[PATCH v2 1/4] tools: docker: Bump up QEMU version to 6.1.0
by Bin Meng 11 Sep '21

11 Sep '21

At present U-Boot CI testing is still using QEMU 4.2.0 which is pretty old. Let's bump up to QEMU 6.1.0. ninja-build is added as the prerequisite required by QEMU 6.1.0. Note there is a bug in QEMU 6.1.0 Xilinx Zynq UART emulation codes. A quick fix [1] was posted on QEMU mailing list but it it too late for 6.1.0 release. Let's manually apply the bug fix on top of the v6.1.0 release tag at the time being. [1] http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2… Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- Changes in v2: - Use QEMU official git repo, and 'git am' the bug fix manually tools/docker/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 0195456dfe..4d7c3c6679 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -76,6 +76,7 @@ RUN apt-get update && apt-get install -y \ mount \ mtd-utils \ mtools \ + ninja-build \ openssl \ picocom \ parted \ @@ -166,7 +167,12 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone git://git.qemu.org/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ git submodule update --init dtc && \ - git checkout v4.2.0 && \ + git checkout v6.1.0 && \ + # config user.name and user.email to make 'git am' happy + git config user.name u-boot && \ + git config user.email u-boot(a)denx.de && \ + # manually apply the bug fix for QEMU 6.1.0 Xilinx Zynq UART emulation codes + wget -O - http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2… | git am && \ ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu -- 2.25.1

2 12

[PATCH] board: sifive: overwrite board_fdt_blob_setup in u-boot proper
by Bin Meng 11 Sep '21

11 Sep '21

Commit 47d73ba4f4a4 ("board: sifive: overwrite board_fdt_blob_setup in u-boot proper") added a board-specific implementation of board_fdt_blob_setup() which takes a pointer as the return value, but it does not return anything if CONFIG_OF_SEPARATE is not enabled. This will cause a build warning seen when testing booting S-mode U-Boot directly from QEMU, per the instructions in [1]: board/sifive/unleashed/unleashed.c: In function ‘board_fdt_blob_setup’: board/sifive/unleashed/unleashed.c:125:1: warning: control reaches end of non-void function [-Wreturn-type] Return &_end as the default case. [1] https://qemu.readthedocs.io/en/latest/system/riscv/sifive_u.html#running-u-… Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- board/sifive/unleashed/unleashed.c | 4 ++-- board/sifive/unmatched/unmatched.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c index 8cd514df30..33baeda986 100644 --- a/board/sifive/unleashed/unleashed.c +++ b/board/sifive/unleashed/unleashed.c @@ -119,9 +119,9 @@ void *board_fdt_blob_setup(void) if (IS_ENABLED(CONFIG_OF_SEPARATE)) { if (gd->arch.firmware_fdt_addr) return (ulong *)gd->arch.firmware_fdt_addr; - else - return (ulong *)&_end; } + + return (ulong *)&_end; } int board_init(void) diff --git a/board/sifive/unmatched/unmatched.c b/board/sifive/unmatched/unmatched.c index d90b252bae..8773b660fa 100644 --- a/board/sifive/unmatched/unmatched.c +++ b/board/sifive/unmatched/unmatched.c @@ -16,9 +16,9 @@ void *board_fdt_blob_setup(void) if (IS_ENABLED(CONFIG_OF_SEPARATE)) { if (gd->arch.firmware_fdt_addr) return (ulong *)gd->arch.firmware_fdt_addr; - else - return (ulong *)&_end; } + + return (ulong *)&_end; } int board_init(void) -- 2.25.1

1 1

[PATCH v2 0/3] J7200/J721E: Fix USB DFU Boot mode
by Aswath Govindraju 11 Sep '21

11 Sep '21

The following series of patches fix USB DFU Boot mode in J7200 and J721E SoC's. changes since v1: - synced up the size allocated for tispl.bin and u-boot.img in dfu ram env variable with that of OSPI and eMMC dfu env variables Aswath Govindraju (3): arm: dts: k3-j721e-r5-*.dts: Fix clock-names property in the usb0 instance environment: ti: k3_dfu: Increase the size allocated for bootloader images in dfu_alt_info_ram configs: j72*_evm: Define the buffer sizes for dfu arch/arm/dts/k3-j721e-r5-common-proc-board.dts | 2 +- configs/j7200_evm_a72_defconfig | 2 ++ configs/j7200_evm_r5_defconfig | 1 + configs/j721e_evm_a72_defconfig | 2 ++ configs/j721e_evm_r5_defconfig | 1 + include/configs/j721e_evm.h | 2 -- include/environment/ti/k3_dfu.h | 4 ++-- 7 files changed, 9 insertions(+), 5 deletions(-) -- 2.17.1

2 6

[PATCH v2] ARM: dts: Fix node status to "okay" on TI boards
by Roger Quadros 11 Sep '21

11 Sep '21

As per Device Tree Specification [1], the status parameter of nodes can be "okay", "disabled", etc. "ok" is not a valid parameter. U-boot Driver Model does not recognize status="ok" either and treats the node as disabled. [1] https://github.com/devicetree-org/devicetree-specification/releases/tag/v0.3 Signed-off-by: Roger Quadros <rogerq(a)kernel.org> --- Changelog: v2: - Updated commit message to refer to DT spec instead of schema. arch/arm/dts/am3517-evm-ui.dtsi | 4 ++-- arch/arm/dts/am3517-evm.dts | 2 +- arch/arm/dts/am437x-gp-evm.dts | 2 +- arch/arm/dts/am43x-epos-evm.dts | 2 +- arch/arm/dts/am57xx-beagle-x15-common.dtsi | 6 +++--- arch/arm/dts/da850-evm.dts | 2 +- arch/arm/dts/dra7-evm.dts | 2 +- arch/arm/dts/dra72-evm-common.dtsi | 6 +++--- arch/arm/dts/keystone-k2e-evm.dts | 2 +- arch/arm/dts/keystone-k2hk-evm.dts | 2 +- arch/arm/dts/keystone-k2l-evm.dts | 2 +- arch/arm/dts/omap3-beagle-xm.dts | 4 ++-- arch/arm/dts/omap3-beagle.dts | 6 +++--- arch/arm/dts/omap3-igep0020-common.dtsi | 2 +- arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 2 +- arch/arm/dts/omap34xx.dtsi | 2 +- arch/arm/dts/omap36xx.dtsi | 2 +- arch/arm/dts/omap4-panda-common.dtsi | 6 +++--- arch/arm/dts/omap4-sdp.dts | 8 ++++---- arch/arm/dts/omap5-board-common.dtsi | 4 ++-- 20 files changed, 34 insertions(+), 34 deletions(-) diff --git a/arch/arm/dts/am3517-evm-ui.dtsi b/arch/arm/dts/am3517-evm-ui.dtsi index e841918c1c..54aa2522aa 100644 --- a/arch/arm/dts/am3517-evm-ui.dtsi +++ b/arch/arm/dts/am3517-evm-ui.dtsi @@ -186,14 +186,14 @@ }; &mcbsp1 { - status = "ok"; + status = "okay"; #sound-dai-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&mcbsp1_pins>; }; &mcbsp2 { - status = "ok"; + status = "okay"; #sound-dai-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&mcbsp2_pins>; diff --git a/arch/arm/dts/am3517-evm.dts b/arch/arm/dts/am3517-evm.dts index 3527c0f2df..935c471c97 100644 --- a/arch/arm/dts/am3517-evm.dts +++ b/arch/arm/dts/am3517-evm.dts @@ -193,7 +193,7 @@ }; &dss { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&dss_dpi_pins>; diff --git a/arch/arm/dts/am437x-gp-evm.dts b/arch/arm/dts/am437x-gp-evm.dts index 3c500d52db..21f7691f49 100644 --- a/arch/arm/dts/am437x-gp-evm.dts +++ b/arch/arm/dts/am437x-gp-evm.dts @@ -742,7 +742,7 @@ }; &dss { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&dss_pins>; diff --git a/arch/arm/dts/am43x-epos-evm.dts b/arch/arm/dts/am43x-epos-evm.dts index 65f157ed59..b940bc6ccf 100644 --- a/arch/arm/dts/am43x-epos-evm.dts +++ b/arch/arm/dts/am43x-epos-evm.dts @@ -752,7 +752,7 @@ }; &dss { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&dss_pins>; diff --git a/arch/arm/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/dts/am57xx-beagle-x15-common.dtsi index d6b94d528f..1912ea9a15 100644 --- a/arch/arm/dts/am57xx-beagle-x15-common.dtsi +++ b/arch/arm/dts/am57xx-beagle-x15-common.dtsi @@ -528,13 +528,13 @@ }; &dss { - status = "ok"; + status = "okay"; vdda_video-supply = <&ldoln_reg>; }; &hdmi { - status = "ok"; + status = "okay"; vdda-supply = <&ldo4_reg>; port { @@ -545,7 +545,7 @@ }; &pcie1_rc { - status = "ok"; + status = "okay"; gpios = <&gpio2 8 GPIO_ACTIVE_LOW>; }; diff --git a/arch/arm/dts/da850-evm.dts b/arch/arm/dts/da850-evm.dts index f04bc3e153..b331cefd18 100644 --- a/arch/arm/dts/da850-evm.dts +++ b/arch/arm/dts/da850-evm.dts @@ -405,7 +405,7 @@ &aemif { pinctrl-names = "default"; pinctrl-0 = <&nand_pins>; - status = "ok"; + status = "okay"; cs3 { #address-cells = <2>; #size-cells = <1>; diff --git a/arch/arm/dts/dra7-evm.dts b/arch/arm/dts/dra7-evm.dts index 43de9638e3..8e9a1a80a8 100644 --- a/arch/arm/dts/dra7-evm.dts +++ b/arch/arm/dts/dra7-evm.dts @@ -501,7 +501,7 @@ }; &dcan1 { - status = "ok"; + status = "okay"; pinctrl-names = "default", "sleep", "active"; pinctrl-0 = <&dcan1_pins_sleep>; pinctrl-1 = <&dcan1_pins_sleep>; diff --git a/arch/arm/dts/dra72-evm-common.dtsi b/arch/arm/dts/dra72-evm-common.dtsi index 2e485a13df..964e5e9b90 100644 --- a/arch/arm/dts/dra72-evm-common.dtsi +++ b/arch/arm/dts/dra72-evm-common.dtsi @@ -430,7 +430,7 @@ }; &dcan1 { - status = "ok"; + status = "okay"; pinctrl-names = "default", "sleep", "active"; pinctrl-0 = <&dcan1_pins_sleep>; pinctrl-1 = <&dcan1_pins_sleep>; @@ -499,11 +499,11 @@ }; &dss { - status = "ok"; + status = "okay"; }; &hdmi { - status = "ok"; + status = "okay"; port { hdmi_out: endpoint { diff --git a/arch/arm/dts/keystone-k2e-evm.dts b/arch/arm/dts/keystone-k2e-evm.dts index 9288df21ce..bb197e133e 100644 --- a/arch/arm/dts/keystone-k2e-evm.dts +++ b/arch/arm/dts/keystone-k2e-evm.dts @@ -142,7 +142,7 @@ }; &mdio { - status = "ok"; + status = "okay"; ethphy0: ethernet-phy@0 { compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22"; reg = <0>; diff --git a/arch/arm/dts/keystone-k2hk-evm.dts b/arch/arm/dts/keystone-k2hk-evm.dts index 84c58d75ad..acfcaff0a8 100644 --- a/arch/arm/dts/keystone-k2hk-evm.dts +++ b/arch/arm/dts/keystone-k2hk-evm.dts @@ -170,7 +170,7 @@ }; &mdio { - status = "ok"; + status = "okay"; ethphy0: ethernet-phy@0 { compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22"; reg = <0>; diff --git a/arch/arm/dts/keystone-k2l-evm.dts b/arch/arm/dts/keystone-k2l-evm.dts index 91cefdf2aa..ca049ba81b 100644 --- a/arch/arm/dts/keystone-k2l-evm.dts +++ b/arch/arm/dts/keystone-k2l-evm.dts @@ -119,7 +119,7 @@ }; &mdio { - status = "ok"; + status = "okay"; ethphy0: ethernet-phy@0 { compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22"; reg = <0>; diff --git a/arch/arm/dts/omap3-beagle-xm.dts b/arch/arm/dts/omap3-beagle-xm.dts index 0349fcc9dc..8461159baf 100644 --- a/arch/arm/dts/omap3-beagle-xm.dts +++ b/arch/arm/dts/omap3-beagle-xm.dts @@ -379,7 +379,7 @@ }; &dss { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = < @@ -396,7 +396,7 @@ }; &venc { - status = "ok"; + status = "okay"; vdda-supply = <&vdac>; diff --git a/arch/arm/dts/omap3-beagle.dts b/arch/arm/dts/omap3-beagle.dts index 3ca8991a6c..4ceee2ba19 100644 --- a/arch/arm/dts/omap3-beagle.dts +++ b/arch/arm/dts/omap3-beagle.dts @@ -353,7 +353,7 @@ }; &dss { - status = "ok"; + status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&dss_dpi_pins>; @@ -367,7 +367,7 @@ }; &venc { - status = "ok"; + status = "okay"; vdda-supply = <&vdac>; @@ -380,7 +380,7 @@ }; &gpmc { - status = "ok"; + status = "okay"; ranges = <0 0 0x30000000 0x1000000>; /* CS0 space, 16MB */ /* Chip select 0 */ diff --git a/arch/arm/dts/omap3-igep0020-common.dtsi b/arch/arm/dts/omap3-igep0020-common.dtsi index ecbec23af4..d62481dacd 100644 --- a/arch/arm/dts/omap3-igep0020-common.dtsi +++ b/arch/arm/dts/omap3-igep0020-common.dtsi @@ -248,7 +248,7 @@ }; &dss { - status = "ok"; + status = "okay"; port { dpi_out: endpoint { diff --git a/arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi b/arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi index b8b9fcc41e..2dbb687d4d 100644 --- a/arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi +++ b/arch/arm/dts/omap3-panel-sharp-ls037v7dw01.dtsi @@ -46,7 +46,7 @@ }; &dss { - status = "ok"; + status = "okay"; port { dpi_out: endpoint { remote-endpoint = <&lcd_in>; diff --git a/arch/arm/dts/omap34xx.dtsi b/arch/arm/dts/omap34xx.dtsi index ac4f8795b7..a703d09736 100644 --- a/arch/arm/dts/omap34xx.dtsi +++ b/arch/arm/dts/omap34xx.dtsi @@ -69,7 +69,7 @@ }; &ssi { - status = "ok"; + status = "okay"; clocks = <&ssi_ssr_fck>, <&ssi_sst_fck>, diff --git a/arch/arm/dts/omap36xx.dtsi b/arch/arm/dts/omap36xx.dtsi index 6fb23ada1f..52e1b8ce0f 100644 --- a/arch/arm/dts/omap36xx.dtsi +++ b/arch/arm/dts/omap36xx.dtsi @@ -153,7 +153,7 @@ }; &ssi { - status = "ok"; + status = "okay"; clocks = <&ssi_ssr_fck>, <&ssi_sst_fck>, diff --git a/arch/arm/dts/omap4-panda-common.dtsi b/arch/arm/dts/omap4-panda-common.dtsi index 55ea8b6189..c124b20d46 100644 --- a/arch/arm/dts/omap4-panda-common.dtsi +++ b/arch/arm/dts/omap4-panda-common.dtsi @@ -546,7 +546,7 @@ }; &dss { - status = "ok"; + status = "okay"; port { dpi_out: endpoint { @@ -557,12 +557,12 @@ }; &dsi2 { - status = "ok"; + status = "okay"; vdd-supply = <&vcxio>; }; &hdmi { - status = "ok"; + status = "okay"; vdda-supply = <&vdac>; port { diff --git a/arch/arm/dts/omap4-sdp.dts b/arch/arm/dts/omap4-sdp.dts index 91480ac1f3..28b989cfdb 100644 --- a/arch/arm/dts/omap4-sdp.dts +++ b/arch/arm/dts/omap4-sdp.dts @@ -648,11 +648,11 @@ }; &dss { - status = "ok"; + status = "okay"; }; &dsi1 { - status = "ok"; + status = "okay"; vdd-supply = <&vcxio>; port { @@ -677,7 +677,7 @@ }; &dsi2 { - status = "ok"; + status = "okay"; vdd-supply = <&vcxio>; port { @@ -702,7 +702,7 @@ }; &hdmi { - status = "ok"; + status = "okay"; vdda-supply = <&vdac>; port { diff --git a/arch/arm/dts/omap5-board-common.dtsi b/arch/arm/dts/omap5-board-common.dtsi index 68ac04641b..1eedd8d706 100644 --- a/arch/arm/dts/omap5-board-common.dtsi +++ b/arch/arm/dts/omap5-board-common.dtsi @@ -743,11 +743,11 @@ }; &dss { - status = "ok"; + status = "okay"; }; &hdmi { - status = "ok"; + status = "okay"; /* vdda-supply populated in board specific dts file */ -- 2.17.1

3 2

[PATCH] tools: k3_fit_atf: Fix DM binary FIT load addresses
by Suman Anna 11 Sep '21

11 Sep '21

The DM binary runs on the MCU R5F Core0 after R5 SPL on J721E and J7200 SoCs. The binary is built alongside the TFA, OPTEE and A72 SPL binaries and included in the tispl.bin FIT image. The R5 SPL loads the DM binary at 0xA000000 address, based on the value used in the FIT image build script. The DM binary though is an ELF image and not a regular binary file, and so is processed further to load the actual program segments using the U-Boot's standard ELF loader library. The DM binary does leverage a certain portion of DDR for its program segments, and typically reserves 16 MB of DDR at 0xA000000 with the 1st MB used for IPC between Linux and the remote processor, and remaining memory for firmware segments. This can cause an incomplete loading of the program segments if the DM binary is larger than 1 MB, due to overlap of the initial loaded binary and the actual program segments. Fix this by using the address 0x89000000, which matches the current "addr_mcur5f0_0load" env variable used by R5 SPL before the DM firmware inclusion into the tispl.bin. Fixes: df5363a67f35 ("tools: k3_fit_atf: add DM binary to the FIT image") Signed-off-by: Suman Anna <s-anna(a)ti.com> --- Hi Lokesh, This issue is found recently when attempting to use an unstripper DM firmware binary, it was masked with the existing DM binary since it's size was very small. The script can do with some overhaul, as it is not generic and uses hard-coded addresses. It should be possible to place ATF, OPTEE and use a complete different memory layout for firmware images. The ATF address selection is adjusted recently, but the others remain. regards Suman tools/k3_fit_atf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/k3_fit_atf.sh b/tools/k3_fit_atf.sh index 3a476ced98b1..7bc07ad07468 100755 --- a/tools/k3_fit_atf.sh +++ b/tools/k3_fit_atf.sh @@ -67,8 +67,8 @@ cat << __HEADER_EOF arch = "arm32"; compression = "none"; os = "DM"; - load = <0xa0000000>; - entry = <0xa0000000>; + load = <0x89000000>; + entry = <0x89000000>; }; spl { description = "SPL (64-bit)"; -- 2.32.0

2 2

[PATCH] arm: dts: k3-am642-evm-u-boot: Add u-boot, dm-spl tag in the pinmux node of mmc1
by Aswath Govindraju 11 Sep '21

11 Sep '21

Add u-boot,dm-spl tag in the pinmux device tree node, required for MMCSD1 subsystem. Fixes: b6059ddc45b9 ("arm: dts: k3-am642: Add r5 specific dt support") Signed-off-by: Aswath Govindraju <a-govindraju(a)ti.com> --- arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index ed38b7269ee5..03688a51a301 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -59,6 +59,10 @@ u-boot,dm-spl; }; +&main_mmc1_pins_default { + u-boot,dm-spl; +}; + &main_usb0_pins_default { u-boot,dm-spl; }; -- 2.17.1

2 1