January 2023 - U-Boot

[PATCH v2 00/22] apalis-imx8: boot issue fix and support refresh
by Francesco Dolcini 16 Jan '23

16 Jan '23

From: Francesco Dolcini <francesco.dolcini(a)toradex.com> This series fixes a boot issue and refreshes Apalis iMX8 support as follows: - fix booting caused by missing DM_EVENT - implement PCB version and SoC variant handling - turn off LCD backlight before OS handover - display build info - provide proper prompt - set bootdelay - add overlays support - remove global environment variable script - enable environment bootcount limit - update SPDX license identifier string - remove obsolete SDHC related config defines - remove obsolete net usb start - introduce setup setting setupargs - drop obsolete environment variables - update update_uboot confirmation message - update env memory layout - use correct type for sc_pm_setup_uart() return value - remove board_phy_config() from board file - initialize svns - add aux cores helpers - add emmc/mmc card pinctrl's for different speeds Changes in v2: - fixed issue in pcb version and soc variant handling for 8GB SKU - remove another spurious variable from the environment, boot_file - new commit: use correct type for sc_pm_setup_uart() return value - new commit: remove useless board_phy_config() from board file - new commit: initialize svns - new commit: add aux core helpers - new commit: add emmc/mmc card pinctrl's for different speeds Andrejs Cainikovs (5): board: apalis-imx8: remove board_phy_config duplicate board: apalis-imx8: initialize snvs apalis-imx8: set bootaux memory base and size apalis-imx8: add M4 boot environment helpers apalis-imx8: add emmc/mmc card pinctrl's for different speeds Igor Opaniuk (1): apalis-imx8: provide proper config_sys_prompt Marcel Ziswiler (13): apalis-imx8: fix booting caused by missing dm_event apalis-imx8: implement pcb version and soc variant handling apalis-imx8: turn off lcd backlight before os handover apalis-imx8: display build info apalis-imx8: set bootdelay apalis-imx8: enable environment bootcount limit apalis-imx8: update spdx license identifier string apalis-imx8: remove obsolete sdhc related config defines apalis-imx8: remove obsolete net usb start apalis-imx8: introduce setup setting setupargs apalis-imx8: drop obsolete environment variables apalis-imx8: update update_uboot confirmation message apalis-imx8: update env memory layout Oleksandr Suvorov (2): apalis/colibri-imx8/8x: add overlay support for i.mx 8/8x-based soms apalis/colibri-imx8/8x: remove global variable script Philippe Schenker (1): board: apalis-imx8: get rid of sc_err_t type arch/arm/dts/fsl-imx8qm-apalis.dts | 12 +- board/toradex/apalis-imx8/Makefile | 4 +- .../apalis-imx8/apalis-imx8-imximage.cfg | 4 +- board/toradex/apalis-imx8/apalis-imx8.c | 152 ++++++++++++++++-- configs/apalis-imx8_defconfig | 12 +- configs/colibri-imx8x_defconfig | 1 + include/configs/apalis-imx8.h | 54 +++---- include/configs/colibri-imx8x.h | 1 - 8 files changed, 183 insertions(+), 57 deletions(-) -- 2.25.1

4 35

[PATCH v1 00/16] apalis-imx8: boot issue fix and support refresh
by Marcel Ziswiler 16 Jan '23

16 Jan '23

From: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> This series fixes a boot issue and refreshes Apalis iMX8 support as follows: - fix booting caused by missing DM_EVENT - implement PCB version and SoC variant handling - turn off LCD backlight before OS handover - display build info - provide proper prompt - set bootdelay - add overlays support - remove global environment variable script - enable environment bootcount limit - update SPDX license identifier string - remove obsolete SDHC related config defines - remove obsolete net usb start - introduce setup setting setupargs - drop obsolete environment variables - update update_uboot confirmation message - update env memory layout Igor Opaniuk (1): apalis-imx8: provide proper config_sys_prompt Marcel Ziswiler (13): apalis-imx8: fix booting caused by missing dm_event apalis-imx8: implement pcb version and soc variant handling apalis-imx8: turn off lcd backlight before os handover apalis-imx8: display build info apalis-imx8: set bootdelay apalis-imx8: enable environment bootcount limit apalis-imx8: update spdx license identifier string apalis-imx8: remove obsolete sdhc related config defines apalis-imx8: remove obsolete net usb start apalis-imx8: introduce setup setting setupargs apalis-imx8: drop obsolete environment variables apalis-imx8: update update_uboot confirmation message apalis-imx8: update env memory layout Oleksandr Suvorov (2): apalis/colibri-imx8/8x: add overlay support for i.mx 8/8x-based soms apalis/colibri-imx8/8x: remove global variable script arch/arm/dts/fsl-imx8qm-apalis.dts | 4 +- board/toradex/apalis-imx8/Makefile | 4 +- .../apalis-imx8/apalis-imx8-imximage.cfg | 4 +- board/toradex/apalis-imx8/apalis-imx8.c | 129 +++++++++++++++++- configs/apalis-imx8_defconfig | 10 +- configs/colibri-imx8x_defconfig | 1 + include/configs/apalis-imx8.h | 45 ++---- include/configs/colibri-imx8x.h | 1 - 8 files changed, 156 insertions(+), 42 deletions(-) -- 2.35.1

5 22

[PATCH 0/3] dm: input: driver for buttons with linux, code declaration
by Dzmitry Sankouski 16 Jan '23

16 Jan '23

Bootmenu requires an input device with arrows and enter key. A common smartphone luckily has power, volume up/down buttons, which may be used for controlling bootmenu. Button keyboard driver relies on button driver - iterates over all button with linux,code, checks state and sends events. Add support for linux,code in button driver. Fix qcom pwr-key gpio driver to work with button driver. Dzmitry Sankouski (3): gpio: qcom: add direction functions for pwrkey dm: button: add support for linux_code in button-gpio.c driver dm: input: add button_kbd driver drivers/button/button-gpio.c | 20 ++++++ drivers/button/button-uclass.c | 10 +++ drivers/gpio/qcom_pmic_gpio.c | 15 ++++ drivers/input/Kconfig | 9 +++ drivers/input/Makefile | 1 + drivers/input/button_kbd.c | 123 +++++++++++++++++++++++++++++++++ include/button.h | 16 +++++ 7 files changed, 194 insertions(+) create mode 100644 drivers/input/button_kbd.c -- 2.30.2

3 9

[PATCH] xilinx: versal-net: Add support for timer and start it
by Michal Simek 16 Jan '23

16 Jan '23

From: Ashok Reddy Soma <ashok.reddy.soma(a)amd.com> Add support for starting timer by setting up time stamp generator registers. This is done only for EL3 i.e. mini U-Boot case. For other cases, it will be done TF-A. Add COUNTER_FREQUENCY and IOU_SWITCH_DIVISOR0 to Kconfig so that they can be tuned as required. Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)amd.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/mach-versal-net/Kconfig | 12 ++++++ .../mach-versal-net/include/mach/hardware.h | 30 ++++++++++++++ board/xilinx/versal-net/board.c | 41 +++++++++++++++++++ configs/xilinx_versal_net_mini_defconfig | 1 + configs/xilinx_versal_net_virt_defconfig | 1 + 5 files changed, 85 insertions(+) diff --git a/arch/arm/mach-versal-net/Kconfig b/arch/arm/mach-versal-net/Kconfig index 62825e189fe6..edff5b039e91 100644 --- a/arch/arm/mach-versal-net/Kconfig +++ b/arch/arm/mach-versal-net/Kconfig @@ -21,6 +21,18 @@ config SYS_CONFIG_NAME Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header will be used for board configuration. +config COUNTER_FREQUENCY + int "Timer clock frequency" + default 0 + help + Setup time clock frequency for certain platform + +config IOU_SWITCH_DIVISOR0 + hex "IOU switch divisor0" + default 0x20 + help + Setup time clock divisor for input clock. + config SYS_MEM_RSVD_FOR_MMU bool "Reserve memory for MMU Table" help diff --git a/arch/arm/mach-versal-net/include/mach/hardware.h b/arch/arm/mach-versal-net/include/mach/hardware.h index 808ce48fd148..c5e4e22040e2 100644 --- a/arch/arm/mach-versal-net/include/mach/hardware.h +++ b/arch/arm/mach-versal-net/include/mach/hardware.h @@ -8,6 +8,36 @@ #include <linux/bitops.h> #endif +struct crlapb_regs { + u32 reserved0[67]; + u32 cpu_r5_ctrl; + u32 reserved; + u32 iou_switch_ctrl; /* 0x114 */ + u32 reserved1[13]; + u32 timestamp_ref_ctrl; /* 0x14c */ + u32 reserved3[108]; + u32 rst_cpu_r5; + u32 reserved2[17]; + u32 rst_timestamp; /* 0x348 */ +}; + +struct iou_scntrs_regs { + u32 counter_control_register; /* 0x0 */ + u32 reserved0[7]; + u32 base_frequency_id_register; /* 0x20 */ +}; + +#define VERSAL_NET_CRL_APB_BASEADDR 0xEB5E0000 +#define VERSAL_NET_IOU_SCNTR_SECURE 0xEC920000 + +#define CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT BIT(25) +#define IOU_SWITCH_CTRL_CLKACT_BIT BIT(25) +#define IOU_SWITCH_CTRL_DIVISOR0_SHIFT 8 +#define IOU_SCNTRS_CONTROL_EN 1 + +#define crlapb_base ((struct crlapb_regs *)VERSAL_NET_CRL_APB_BASEADDR) +#define iou_scntr_secure ((struct iou_scntrs_regs *)VERSAL_NET_IOU_SCNTR_SECURE) + #define PMC_TAP 0xF11A0000 #define PMC_TAP_IDCODE (PMC_TAP + 0) diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index 760031927f7c..5fb71107ddce 100644 --- a/board/xilinx/versal-net/board.c +++ b/board/xilinx/versal-net/board.c @@ -121,6 +121,47 @@ int board_early_init_f(void) int board_early_init_r(void) { + u32 val; + + if (current_el() != 3) + return 0; + + debug("iou_switch ctrl div0 %x\n", + readl(&crlapb_base->iou_switch_ctrl)); + + writel(IOU_SWITCH_CTRL_CLKACT_BIT | + (CONFIG_IOU_SWITCH_DIVISOR0 << IOU_SWITCH_CTRL_DIVISOR0_SHIFT), + &crlapb_base->iou_switch_ctrl); + + /* Global timer init - Program time stamp reference clk */ + val = readl(&crlapb_base->timestamp_ref_ctrl); + val |= CRL_APB_TIMESTAMP_REF_CTRL_CLKACT_BIT; + writel(val, &crlapb_base->timestamp_ref_ctrl); + + debug("ref ctrl 0x%x\n", + readl(&crlapb_base->timestamp_ref_ctrl)); + + /* Clear reset of timestamp reg */ + writel(0, &crlapb_base->rst_timestamp); + + /* + * Program freq register in System counter and + * enable system counter. + */ + writel(CONFIG_COUNTER_FREQUENCY, + &iou_scntr_secure->base_frequency_id_register); + + debug("counter val 0x%x\n", + readl(&iou_scntr_secure->base_frequency_id_register)); + + writel(IOU_SCNTRS_CONTROL_EN, + &iou_scntr_secure->counter_control_register); + + debug("scntrs control 0x%x\n", + readl(&iou_scntr_secure->counter_control_register)); + debug("timer 0x%llx\n", get_ticks()); + debug("timer 0x%llx\n", get_ticks()); + return 0; } diff --git a/configs/xilinx_versal_net_mini_defconfig b/configs/xilinx_versal_net_mini_defconfig index c5fa431a8c9d..5bad1791964f 100644 --- a/configs/xilinx_versal_net_mini_defconfig +++ b/configs/xilinx_versal_net_mini_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="xilinx_versal_net_mini" CONFIG_SYS_ICACHE_OFF=y # CONFIG_ARM64_CRC32 is not set +CONFIG_COUNTER_FREQUENCY=100000000 # CONFIG_ARM64_SUPPORT_AARCH32 is not set CONFIG_ARCH_VERSAL_NET=y CONFIG_TEXT_BASE=0xBBF10000 diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index 2fdf99f7cbbd..729c6ad4503b 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_COUNTER_FREQUENCY=100000000 CONFIG_POSITION_INDEPENDENT=y CONFIG_SYS_INIT_SP_BSS_OFFSET=1572864 CONFIG_ARCH_VERSAL_NET=y -- 2.36.1

1 1

[PATCH] clk: versal: Return error in case if clock setup failed
by Michal Simek 16 Jan '23

16 Jan '23

From: Jay Buddhabhatti <jay.buddhabhatti(a)xilinx.com> Currently probe is getting success even if clock setup is failed because of that u-boot is trying to access invalid clocks. So return error if clock setup failed. Signed-off-by: Jay Buddhabhatti <jay.buddhabhatti(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- drivers/clk/clk_versal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c index 76fde00491b2..faebbab1c6d3 100644 --- a/drivers/clk/clk_versal.c +++ b/drivers/clk/clk_versal.c @@ -657,7 +657,9 @@ static int versal_clk_probe(struct udevice *dev) if (ret < 0) return -EINVAL; - versal_clock_setup(); + ret = versal_clock_setup(); + if (ret < 0) + return ret; priv->clk = clock; -- 2.36.1

1 1

[bug] timer: orion-timer: static variable patch breaks armada-388-clearfog boot
by Martin Rowe 16 Jan '23

16 Jan '23

Hi, Commit 5387b093 was a fix for early_init_done causing issues on Pogo v4 [1]. The fix breaks armada-388-clearfog because the boot hangs indefinitely. It appears that the cause is an infinite loop in __udelay due to get_ticks() always returning 0. After adding some printf statements it became apparent that the timer was never getting initialised. git-blame identified the "timer: orion-timer: Fix problem with early static variable" patch as a likely issue. Reverting the commit restores boot for armada-388-clearfog. Patching the issue is a bit beyond me without understanding the Pogo v4 issue, but I'm happy to test any patches that are developed. Regards Martin [1] https://lore.kernel.org/u-boot/20221221091849.1018783-1-sr@denx.de/

3 4

[PATCH 1/4] dt-bindings: rockchip: Sync rockchip,vop2.h from Linux
by Jagan Teki 16 Jan '23

16 Jan '23

Sync rockchip,vop2.h from linux-next, and the last commit is commit <604be85547ce> ("drm/rockchip: Add VOP2 driver") Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- include/dt-bindings/soc/rockchip,vop2.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 include/dt-bindings/soc/rockchip,vop2.h diff --git a/include/dt-bindings/soc/rockchip,vop2.h b/include/dt-bindings/soc/rockchip,vop2.h new file mode 100644 index 0000000000..6e66a802b9 --- /dev/null +++ b/include/dt-bindings/soc/rockchip,vop2.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ + +#ifndef __DT_BINDINGS_ROCKCHIP_VOP2_H +#define __DT_BINDINGS_ROCKCHIP_VOP2_H + +#define ROCKCHIP_VOP2_EP_RGB0 1 +#define ROCKCHIP_VOP2_EP_HDMI0 2 +#define ROCKCHIP_VOP2_EP_EDP0 3 +#define ROCKCHIP_VOP2_EP_MIPI0 4 +#define ROCKCHIP_VOP2_EP_LVDS0 5 +#define ROCKCHIP_VOP2_EP_MIPI1 6 +#define ROCKCHIP_VOP2_EP_LVDS1 7 + +#endif /* __DT_BINDINGS_ROCKCHIP_VOP2_H */ -- 2.25.1

2 7

[PATCH u-boot 1/2] powerpc/mpc85xx: socrates: Rename u-boot-socrates.bin to u-boot.bin
by Pali Rohár 16 Jan '23

16 Jan '23

U-Boot build process for socrates board produces final U-Boot binary in file u-boot-socrates.bin (by binman) And as a bonus it produces two unusable broken binaries u-boot-dtb.bin and u-boot.bin (by Makefile). So do not build broken u-boot-dtb.bin and u-boot.bin binaries and rename board specific u-boot-socrates.bin binary to u-boot.bin. Renaming requires to define a new socrates specific Makefile target for u-boot.bin (via binman) and also changing output name in socrates binman config file. With this change U-Boot build process for socrates board also produces final U-Boot binary in file u-boot.bin. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- Makefile | 11 +++++++++++ arch/powerpc/dts/socrates-u-boot.dtsi | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c977c906b036..117adb1cd8da 100644 --- a/Makefile +++ b/Makefile @@ -1201,22 +1201,30 @@ endif u-boot.bin: u-boot-fit-dtb.bin FORCE $(call if_changed,copy) +ifneq ($(CONFIG_TARGET_SOCRATES),y) u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE $(call if_changed,cat) +endif else ifeq ($(CONFIG_OF_SEPARATE).$(CONFIG_OF_OMIT_DTB),y.) +ifneq ($(CONFIG_TARGET_SOCRATES),y) u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE $(call if_changed,cat) +endif ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy) +ifneq ($(CONFIG_TARGET_SOCRATES),y) u-boot.bin: u-boot-dtb.bin FORCE $(call if_changed,copy) endif +endif else ifneq ($(CONFIG_MPC85XX_HAVE_RESET_VECTOR)$(CONFIG_OF_SEPARATE),yy) +ifneq ($(CONFIG_TARGET_SOCRATES),y) u-boot.bin: u-boot-nodtb.bin FORCE $(call if_changed,copy) endif +endif # we call Makefile in arch/arm/mach-imx which # has targets which are dependent on targets defined @@ -1601,6 +1609,9 @@ u-boot.bin: u-boot-nodtb.bin u-boot.dtb u-boot-br.bin FORCE OBJCOPYFLAGS_u-boot-br.bin := -O binary -j .bootpg -j .resetvec u-boot-br.bin: u-boot FORCE $(call if_changed,objcopy) +else ifeq ($(CONFIG_TARGET_SOCRATES),y) +u-boot.bin: u-boot-nodtb.bin dts/dt.dtb FORCE + $(call if_changed,binman) endif quiet_cmd_ldr = LD $@ diff --git a/arch/powerpc/dts/socrates-u-boot.dtsi b/arch/powerpc/dts/socrates-u-boot.dtsi index 14a7c245dc46..eff413f5b4a2 100644 --- a/arch/powerpc/dts/socrates-u-boot.dtsi +++ b/arch/powerpc/dts/socrates-u-boot.dtsi @@ -5,7 +5,7 @@ */ / { binman { - filename = "u-boot-socrates.bin"; + filename = "u-boot.bin"; pad-byte = <0xff>; // Place dtb one sector before u-boot-nodtb.bin blob { -- 2.20.1

4 36

[PATCH v5 03/13] gnu: u-boot: Reduce the number of native inputs.
by Maxim Cournoyer 16 Jan '23

16 Jan '23

The extra python inputs are only needed for running the u-boot-test-tools test suite. This lowers the requirements for cross-building the various u-boot packages. * gnu/packages/bootloaders.scm (u-boot) [native-inputs]: Delete bc. Move python-coverage, python-pycryptodomex and python-pytest to... * gnu/packages/bootloaders.scm (u-boot-tools) [native-inputs]: ... here. --- Changes in v5: - New commit. gnu/packages/bootloaders.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b17f8b1a9f..7ec26dda05 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -662,8 +662,7 @@ (define u-boot "1y5x8vxdgsqdqlsvq01mn8lmw53fqairkhvhhjx83hjva0m4id2h")))) (build-system gnu-build-system) (native-inputs - (list bc - bison + (list bison dtc gnutls flex @@ -672,9 +671,6 @@ (define u-boot perl pkg-config ;for 'make menuconfig' python - python-coverage - python-pycryptodomex - python-pytest swig (list util-linux "lib"))) (home-page "https://www.denx.de/wiki/U-Boot/") @@ -725,7 +721,7 @@ (define-public u-boot-tools (name "u-boot-tools") (native-inputs (modify-inputs (package-native-inputs u-boot) - (prepend sdl2))) + (prepend python-coverage python-pycryptodomex python-pytest sdl2))) (arguments `(#:make-flags '("HOSTCC=gcc") #:test-target "tcheck" -- 2.38.1

1 0

[PULL] u-boot-sh/master
by Marek Vasut 15 Jan '23

15 Jan '23

The following changes since commit fe4c21de4fbf5756d354d2473ffc675e7596ccfb: Merge tag 'u-boot-stm32-20230113' of https://source.denx.de/u-boot/custodians/u-boot-stm (2023-01-13 09:56:19 -0500) are available in the Git repository at: git://source.denx.de/u-boot-sh.git master for you to fetch changes up to 4327df1d345e502f48a1a23b091ae39110481026: configs: r8a77980: Condor: Enable MMC support by default (2023-01-14 14:10:12 +0100) ---------------------------------------------------------------- Andrey Dolnikov (1): configs: r8a77980: Condor: Enable MMC support by default Hai Pham (1): ARM: renesas: condor: switch eMMC bus to 1V8 Marek Vasut (9): ARM: renesas: Enable LTO on R-Car3 ULCB ARM: renesas: Enable LTO on R-Car3 Eagle ARM: renesas: Enable LTO on R-Car3 Condor ARM: renesas: Enable LTO on R-Car3 Ebisu ARM: renesas: Enable LTO on R-Car3 Draak ARM: renesas: Enable LTO on R-Car3 Falcon ARM: renesas: condor: Set CONFIG_TEXT_BASE=0x0 on R-Car Gen3 Condor ARM: renesas: ulcb: Set CONFIG_TEXT_BASE=0x0 on R-Car Gen3 ULCB ARM: dts: renesas: condor: Enable SPI NOR fast-read arch/arm/dts/r8a77980-condor-u-boot.dts | 1 + arch/arm/dts/r8a77980-condor.dts | 8 +------- configs/r8a77970_eagle_defconfig | 1 + configs/r8a77980_condor_defconfig | 10 ++++++++-- configs/r8a77990_ebisu_defconfig | 1 + configs/r8a77995_draak_defconfig | 1 + configs/r8a779a0_falcon_defconfig | 1 + configs/rcar3_ulcb_defconfig | 3 ++- 8 files changed, 16 insertions(+), 10 deletions(-)

2 1