November 2020 - U-Boot

[PATCH 1/1] riscv: Fix efi header size for RV32
by Leo Liang 17 Nov '20

17 Nov '20

Date: Thu, 12 Nov 2020 10:09:52 +0800 From: Leo Yu-Chi Liang <ycliang(a)andestech.com> Subject: [PATCH 1/1] riscv: Fix efi header size for RV32 This patch depends on Atish's patch. (https://patchwork.ozlabs.org/project/uboot/patch/20201013192331.3236458-1-a…) Modify the size of the Optional Header "Windows-Specific Fields" to fit with the specification. (https://docs.microsoft.com/en-us/windows/win32/debug/pe-format) Signed-off-by: Leo Yu-Chi Liang <ycliang(a)andestech.com> Cc: rick(a)andestech.com Cc: alankao(a)andestech.com Cc: atish.patra(a)wdc.com Cc: xypron.glpk(a)gmx.de Cc: bmeng.cn(a)gmail.com --- arch/riscv/lib/crt0_riscv_efi.S | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/arch/riscv/lib/crt0_riscv_efi.S b/arch/riscv/lib/crt0_riscv_efi.S index 4aaa49ad07..48ff89553b 100644 --- a/arch/riscv/lib/crt0_riscv_efi.S +++ b/arch/riscv/lib/crt0_riscv_efi.S @@ -15,13 +15,13 @@ #define SAVE_LONG(reg, idx) sd reg, (idx*SIZE_LONG)(sp) #define LOAD_LONG(reg, idx) ld reg, (idx*SIZE_LONG)(sp) #define PE_MACHINE IMAGE_FILE_MACHINE_RISCV64 -#define PE_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC +#define PE_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC #else #define SIZE_LONG 4 #define SAVE_LONG(reg, idx) sw reg, (idx*SIZE_LONG)(sp) #define LOAD_LONG(reg, idx) lw reg, (idx*SIZE_LONG)(sp) #define PE_MACHINE IMAGE_FILE_MACHINE_RISCV32 -#define PE_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC +#define PE_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC #endif @@ -50,7 +50,7 @@ coff_header: IMAGE_FILE_LOCAL_SYMS_STRIPPED | \ IMAGE_FILE_DEBUG_STRIPPED) optional_header: - .short PE_MAGIC /* PE32+ format */ + .short PE_MAGIC /* PE32(+) format */ .byte 0x02 /* MajorLinkerVersion */ .byte 0x14 /* MinorLinkerVersion */ .long _edata - _start /* SizeOfCode */ @@ -63,7 +63,11 @@ optional_header: #endif extra_header_fields: +#if __riscv_xlen == 32 + .long 0 /* ImageBase */ +#else .quad 0 /* ImageBase */ +#endif .long 0x20 /* SectionAlignment */ .long 0x8 /* FileAlignment */ .short 0 /* MajorOperatingSystemVersion */ @@ -83,10 +87,17 @@ extra_header_fields: .long 0 /* CheckSum */ .short IMAGE_SUBSYSTEM_EFI_APPLICATION /* Subsystem */ .short 0 /* DllCharacteristics */ +#if __riscv_xlen == 32 + .long 0 /* SizeOfStackReserve */ + .long 0 /* SizeOfStackCommit */ + .long 0 /* SizeOfHeapReserve */ + .long 0 /* SizeOfHeapCommit */ +#else .quad 0 /* SizeOfStackReserve */ .quad 0 /* SizeOfStackCommit */ .quad 0 /* SizeOfHeapReserve */ .quad 0 /* SizeOfHeapCommit */ +#endif .long 0 /* LoaderFlags */ .long 0x6 /* NumberOfRvaAndSizes */ -- 2.17.0

2 2

[PATCH v2 0/2] tools/sunxi: Use mkimage for SPL generation
by Andre Przywara 17 Nov '20

17 Nov '20

Hi, digging this out after two years [1] ;-) I fixed the minor comments from v1 and rebased it, then repeated the tests. Apart from two trivial fixes there were no changes, so I kept the R-b: tags. For a changelog see below. ================== So far creating a bootable SPL image for Allwinner based boards uses the mksunxiboot tool. Most other platforms seemed to have integrated this kind of functionality into the common mkimage tool. Since there is nothing special about the Allwinner image in this respect, just add support for the so-called "eGON" image type into mkimage. If there was a particular reason this hasn't been done before, please let me know. This will eventually allow us to remove mksunxiboot, but I leave it around for now in case of regressions and since some people depend on it from external projects. Patch 1/2 adds the actual support to mkimage, patch 2/2 then switches the Makefile to use mkimage instead of mksunxiboot. I tested all 152 Allwinner boards by building each u-boot-sunxi-with-spl.bin and comparing them against the version created using mksunxiboot (using SOURCE_DATE_EPOCH and .scmversion to create reproducible builds, and by reverting just patch 2/2). All files before and after were identical. Cheers, Andre [1] https://lists.denx.de/pipermail/u-boot/2018-December/352798.html Changelog v1 .. v2: - Drop already merged cleanup patch (v1 1/3) - replace relative include path - remove already defined ALIGN macro - rebase against current master Andre Przywara (2): tools: mkimage: Add Allwinner eGON support sunxi: Use mkimage for SPL boot image generation common/image.c | 1 + include/image.h | 1 + scripts/Makefile.spl | 8 +-- tools/Makefile | 1 + tools/sunxi_egon.c | 133 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 tools/sunxi_egon.c -- 2.17.5

3 4

[PATCH v3] env: mmc: Correct partition comparison in mmc_offset_try_partition
by Hoyeonjiki Kim 17 Nov '20

17 Nov '20

The function mmc_offset_try_partition searches the MMC partition for locating environment data, by comparing the partition names with config "u-boot,mmc-env-parition". However, it only compares the first word-size bytes (size of 'const char *'), which may make the function to find unintended partition. Correct the function not to partially compare the partition name with config "u-boot,mmc-env-partition". Fixes: c9e87ba66540 ("env: Save environment at the end of an MMC partition") Signed-off-by: Hoyeonjiki Kim <jigi.kim(a)gmail.com> Reviewed-by: Jaehoon Chung <jh80.chung(a)samsung.com> Reviewed-by: Jorge Ramire-Ortiz <jramirez(a)baylibre.com> Reviewed-by: Wolfgang Denk <wd(a)denx.de> --- env/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/mmc.c b/env/mmc.c index 4e67180b23..ee376c3e0c 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -42,7 +42,7 @@ static inline int mmc_offset_try_partition(const char *str, int copy, s64 *val) if (ret < 0) return ret; - if (!strncmp((const char *)info.name, str, sizeof(str))) + if (!strncmp((const char *)info.name, str, sizeof(info.name))) break; } -- 2.25.1

3 4

[Patch] fdt: Use phandle to distinguish DT nodes with same name
by Aswath Govindraju 17 Nov '20

17 Nov '20

While assigning the sequence number to subsystem instances by reading the aliases property, only DT nodes names are compared and not the complete path. This causes a problem when there are two DT nodes with same name but have different paths. Fix it by comparing the phandles of DT nodes after the node names match. Signed-off-by: Aswath Govindraju <a-govindraju(a)ti.com> --- lib/fdtdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 2015907dee7d..9e1bfe0b519e 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -478,6 +478,11 @@ int fdtdec_get_alias_seq(const void *blob, const char *base, int offset, slash = strrchr(prop, '/'); if (strcmp(slash + 1, find_name)) continue; + + if (fdt_get_phandle(blob, offset) != + fdt_get_phandle(blob, fdt_path_offset(blob, prop))) + continue; + val = trailing_strtol(name); if (val != -1) { *seqp = val; -- 2.17.1

2 1

[PATCH] rockchip: Enable BINMAN for boards enable SPL_OPTEE
by Kever Yang 17 Nov '20

17 Nov '20

Rockchip has many 32bit SoCs and some of them are support SPL_OPTEE now, only boards with SPL_OPTEE support can fit BINMAN well, other boards will fail at initr_binman() in U-Boot proper after below patch, eg. rv1108 board. 83187546ae binman: Support multiple images in the library Fixes: 79030a4861 ("rockchip: Add Single boot image (with binman, pad_cat)") Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b2f7fcbd6e..5903c09370 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1721,7 +1721,7 @@ config ARCH_STM32MP config ARCH_ROCKCHIP bool "Support Rockchip SoCs" select BLK - select BINMAN if !ARM64 + select BINMAN if SPL_OPTEE select DM select DM_GPIO select DM_I2C -- 2.25.1

2 1

[PATCH v5 15/27] clk: move clk-ti-sci driver to 'ti' directory
by Dario Binacchi 17 Nov '20

17 Nov '20

The patch moves the clk-ti-sci.c file to the 'ti' directory along with all the other TI's drivers, and renames it clk-sci.c. Signed-off-by: Dario Binacchi <dariobin(a)libero.it> --- (no changes since v1) drivers/clk/Kconfig | 8 -------- drivers/clk/Makefile | 1 - drivers/clk/ti/Kconfig | 8 ++++++++ drivers/clk/ti/Makefile | 1 + drivers/clk/{clk-ti-sci.c => ti/clk-sci.c} | 0 5 files changed, 9 insertions(+), 9 deletions(-) rename drivers/clk/{clk-ti-sci.c => ti/clk-sci.c} (100%) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 9e54929039..db06f276ec 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -98,14 +98,6 @@ config CLK_STM32F This clock driver adds support for RCC clock management for STM32F4 and STM32F7 SoCs. -config CLK_TI_SCI - bool "TI System Control Interface (TI SCI) clock driver" - depends on CLK && TI_SCI_PROTOCOL && OF_CONTROL - help - This enables the clock driver support over TI System Control Interface - available on some new TI's SoCs. If you wish to use clock resources - managed by the TI System Controller, say Y here. Otherwise, say N. - config CLK_HSDK bool "Enable cgu clock driver for HSDK boards" depends on CLK && TARGET_HSDK diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 2581fe0a19..f8383e523d 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -48,6 +48,5 @@ obj-$(CONFIG_SANDBOX) += clk_sandbox.o obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o obj-$(CONFIG_SANDBOX_CLK_CCF) += clk_sandbox_ccf.o obj-$(CONFIG_STM32H7) += clk_stm32h7.o -obj-$(CONFIG_CLK_TI_SCI) += clk-ti-sci.o obj-$(CONFIG_CLK_VERSAL) += clk_versal.o obj-$(CONFIG_CLK_CDCE9XX) += clk-cdce9xx.o diff --git a/drivers/clk/ti/Kconfig b/drivers/clk/ti/Kconfig index 9e257a2eb7..2dc86d44a9 100644 --- a/drivers/clk/ti/Kconfig +++ b/drivers/clk/ti/Kconfig @@ -33,3 +33,11 @@ config CLK_TI_MUX depends on CLK && OF_CONTROL && CLK_CCF help This enables the mux clock driver support on TI's SoCs. + +config CLK_TI_SCI + bool "TI System Control Interface (TI SCI) clock driver" + depends on CLK && TI_SCI_PROTOCOL && OF_CONTROL + help + This enables the clock driver support over TI System Control Interface + available on some new TI's SoCs. If you wish to use clock resources + managed by the TI System Controller, say Y here. Otherwise, say N. diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile index c929fe4e28..3d6e0cd79d 100644 --- a/drivers/clk/ti/Makefile +++ b/drivers/clk/ti/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_CLK_TI_CTRL) += clk-ctrl.o obj-$(CONFIG_CLK_TI_DIVIDER) += clk-divider.o obj-$(CONFIG_CLK_TI_GATE) += clk-gate.o obj-$(CONFIG_CLK_TI_MUX) += clk-mux.o +obj-$(CONFIG_CLK_TI_SCI) += clk-sci.o diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/ti/clk-sci.c similarity index 100% rename from drivers/clk/clk-ti-sci.c rename to drivers/clk/ti/clk-sci.c -- 2.17.1

3 18

[GIT PULL] TI changes for v2021.01-rc3
by Lokesh Vutla 17 Nov '20

17 Nov '20

Hi Tom, Please find the PR containing TI related changes targeted for v2020.01-rc3. Details about the PR are updated in the tag message Travis CI build: https://travis-ci.org/github/lokeshvutla/u-boot/builds/743852867 The following changes since commit 832bfad7451e2e7bd23c96edff2be050905ac3f6: libfdt: Fix signedness comparison warnings (2020-11-10 14:31:08 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2021.01-rc3 for you to fetch changes up to 914689a204308df47eb60dfbb394fa4cee4fda31: mtd: OneNAND: Set MTD type (2020-11-15 15:29:40 +0530) ---------------------------------------------------------------- - Fix Nokia RX-51 boot issues - Fix CONFIG_LOGLEVEL on K3 devices - Add phyBOARD REGOR support ---------------------------------------------------------------- Ivaylo Dimitrov (1): Nokia RX-51: Make onenand working Pali Rohár (7): power: twl4030: Add twl4030_i2c_read() function Nokia RX-51: Convert to CONFIG_DM_I2C Nokia RX-51: Remove old comments from configs/nokia_rx51.h file Nokia RX-51: Fix crashing in U-Boot mmc function omap_hsmmc_stop_clock() Nokia RX-51: During init disable lp5523 led instead of resetting it Nokia RX-51: Update test script mtd: OneNAND: Set MTD type Parthiban Nallathambi (1): ARM: am335x: Add phyBOARD REGOR support Roger Quadros (1): configs: am65/j72x: Set CONFIG_LOGLEVEL to 7 arch/arm/dts/Makefile | 3 +- arch/arm/dts/am335x-regor-rdk-u-boot.dtsi | 31 +++++ arch/arm/dts/am335x-regor-rdk.dts | 24 ++++ arch/arm/dts/am335x-regor.dtsi | 202 +++++++++++++++++++++++++++++ board/nokia/rx51/rx51.c | 44 ++++++- board/nokia/rx51/rx51.h | 7 + board/phytec/phycore_am335x_r2/MAINTAINERS | 6 +- configs/am65x_evm_a53_defconfig | 1 + configs/am65x_hs_evm_a53_defconfig | 1 + configs/j7200_evm_a72_defconfig | 1 + configs/j721e_evm_a72_defconfig | 1 + configs/j721e_hs_evm_a72_defconfig | 1 + configs/nokia_rx51_defconfig | 2 + configs/phycore-am335x-r2-regor_defconfig | 88 +++++++++++++ drivers/mtd/onenand/onenand_base.c | 1 + drivers/power/twl4030.c | 7 +- include/configs/nokia_rx51.h | 12 -- include/twl4030.h | 12 +- test/nokia_rx51_test.sh | 27 ++-- 19 files changed, 431 insertions(+), 40 deletions(-) create mode 100644 arch/arm/dts/am335x-regor-rdk-u-boot.dtsi create mode 100644 arch/arm/dts/am335x-regor-rdk.dts create mode 100644 arch/arm/dts/am335x-regor.dtsi create mode 100644 configs/phycore-am335x-r2-regor_defconfig -- 2.23.0

2 1

[PATCH] mmc: display an error number to debug
by Jaehoon Chung 16 Nov '20

16 Nov '20

It's useful to know an error number when it's debugging. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/mmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 7783535d0953..2457c6fef97a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2179,7 +2179,7 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps) err = mmc_execute_tuning(mmc, mwt->tuning); if (err) { - pr_debug("tuning failed\n"); + pr_debug("tuning failed : %d\n", err); goto error; } } @@ -2200,7 +2200,7 @@ error: } } - pr_err("unable to select a mode\n"); + pr_err("unable to select a mode : %d\n", err); return -ENOTSUPP; } @@ -2746,7 +2746,7 @@ static int mmc_power_on(struct mmc *mmc) int ret = regulator_set_enable(mmc->vmmc_supply, true); if (ret) { - puts("Error enabling VMMC supply\n"); + puts("Error enabling VMMC supply : %d\n", ret); return ret; } } @@ -2762,7 +2762,7 @@ static int mmc_power_off(struct mmc *mmc) int ret = regulator_set_enable(mmc->vmmc_supply, false); if (ret) { - pr_debug("Error disabling VMMC supply\n"); + pr_debug("Error disabling VMMC supply : %d\n", ret); return ret; } } @@ -2866,7 +2866,7 @@ retry: if (err) { #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) - pr_err("Card did not respond to voltage select!\n"); + pr_err("Card did not respond to voltage select! : %d\n", err); #endif return -EOPNOTSUPP; } -- 2.29.0

3 3

[PULL u-boot] Please pull u-boot-amlogic-20201116
by Neil Armstrong 16 Nov '20

16 Nov '20

Hi Tom, This PR fixes the MMC driver on SM1 based platforms, syncs the SoC Ids and fixes 2 potential build warning. The CI job is at https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/pipelines/5354 Thanks, Neil The following changes since commit 832bfad7451e2e7bd23c96edff2be050905ac3f6: libfdt: Fix signedness comparison warnings (2020-11-10 14:31:08 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic.git tags/u-boot-amlogic-20201116 for you to fetch changes up to c87eab81616d671a6004ffc95847bad21b7eb005: ARM: dts: meson-sm1: add u-boot specific MMC controller compatible (2020-11-12 14:31:29 +0100) ---------------------------------------------------------------- - Clock fix MMC driver for SM1 based platforms - sync SOC Ids from Linux 5.10-rc1 - fix potential build warning on meson_dw_hdmi and meson-g12a-usb2 phy ---------------------------------------------------------------- Jaehoon Chung (2): phy: meson-g12a-usb2: fix the potential build warning video: meson: meson_dw_hdmi: fix the potential build warning Neil Armstrong (4): ARM: mach-meson: update SoC IDs mmc: meson-gx: move arch header to local header mmc: meson-gx: change clock phase value on SM1 SoCs ARM: dts: meson-sm1: add u-boot specific MMC controller compatible .../dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi | 1 + arch/arm/dts/meson-khadas-vim3-u-boot.dtsi | 2 -- arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi | 1 + arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-sei610-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-u-boot.dtsi | 20 +++++++++++++++ arch/arm/mach-meson/board-info.c | 7 +++++- drivers/mmc/meson_gx_mmc.c | 29 ++++++++++++++++++---- .../sd_emmc.h => drivers/mmc/meson_gx_mmc.h | 10 +++++--- drivers/phy/meson-g12a-usb2.c | 4 +-- drivers/video/meson/meson_dw_hdmi.c | 2 ++ 11 files changed, 64 insertions(+), 16 deletions(-) create mode 100644 arch/arm/dts/meson-sm1-u-boot.dtsi rename arch/arm/include/asm/arch-meson/sd_emmc.h => drivers/mmc/meson_gx_mmc.h (95%)

2 1

Pull request: u-boot-rockchip-20201113
by Kever Yang 16 Nov '20

16 Nov '20

Hi Tom, Please pull the rockchip updates/fixes: - Fix USB support for rk3399 Pinebook Pro; - Fix SPI boot for rk3399 boards other than Bob; - Fix 32bit boards firmware build without SPL_OPTEE support; - Fix rockchip display driver license; Gitlab ci: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/5336 Thanks, - Kever The following changes since commit 832bfad7451e2e7bd23c96edff2be050905ac3f6: libfdt: Fix signedness comparison warnings (2020-11-10 14:31:08 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20201113 for you to fetch changes up to b197c934b11f611dcc1a083d90e68019d1e010cf: rockchip: Pinebook Pro: Fix USB (2020-11-13 18:17:57 +0800) ---------------------------------------------------------------- Alper Nebi Yasak (3): rockchip: rk3399: Init clocks in U-Boot proper if SPL was not run rockchip: gru: Allow setting up clocks in U-Boot proper video: rockchip: Restrict EDP, VOP, MIPI files to GPL-2.0 Hugh Cole-Baker (1): rockchip: rockpro64: fix boot from SPI flash on spi1 Kever Yang (1): rockchip: Enable BINMAN for boards enable SPL_OPTEE Peter Robinson (1): rockchip: Pinebook Pro: Fix USB arch/arm/Kconfig | 2 +- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 ---- arch/arm/include/asm/arch-rockchip/edp_rk3288.h | 2 +- arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 2 +- board/google/gru/gru.c | 23 +++++++++++++++++++++++ configs/chromebook_bob_defconfig | 5 +++++ configs/pinebook-pro-rk3399_defconfig | 5 ++++- configs/rockpro64-rk3399_defconfig | 2 ++ drivers/clk/rockchip/clk_rk3399.c | 22 ++++++++++++++++------ drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3288_vop.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk3399_vop.c | 2 +- drivers/video/rockchip/rk_edp.c | 2 +- drivers/video/rockchip/rk_mipi.c | 2 +- drivers/video/rockchip/rk_mipi.h | 2 +- drivers/video/rockchip/rk_vop.c | 2 +- drivers/video/rockchip/rk_vop.h | 2 +- 18 files changed, 62 insertions(+), 23 deletions(-)

2 1