August 2020 - U-Boot

[PATCH] Dockerfile: update sbsigntools to v0.9.4
by AKASHI Takahiro 06 Aug '20

06 Aug '20

This version of sbsigntools is a prerequisite in testing "intermediate certificates" support as part of UEFI secure boot as I added '--addcert' option to 'sbsign' command: === commit 7d6210e4b1fd Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Date: Thu Jun 4 16:50:22 2020 +0900 sbsign: allow for adding intermediate certificates === Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Dockerfile b/Dockerfile index 209e008b74b2..dfb61c6c705b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,6 +37,7 @@ RUN apt-get update && apt-get install -y \ automake \ autopoint \ bc \ + binutils-dev \ bison \ build-essential \ clang-10 \ @@ -52,9 +53,11 @@ RUN apt-get update && apt-get install -y \ flex \ gdisk \ git \ + gnu-efi \ graphviz \ grub-efi-amd64-bin \ grub-efi-ia32-bin \ + help2man \ iasl \ imagemagick \ iputils-ping \ @@ -76,6 +79,7 @@ RUN apt-get update && apt-get install -y \ openssl \ picocom \ parted \ + pkg-config \ python \ python-dev \ python-pip \ @@ -90,6 +94,7 @@ RUN apt-get update && apt-get install -y \ sudo \ swig \ util-linux \ + uuid-dev \ virtualenv \ zip \ && rm -rf /var/lib/apt/lists/* @@ -100,6 +105,16 @@ RUN wget http://mirrors.kernel.org/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.4-1_amd # Manually install a new enough version of efitools (must be v1.5.2 or later) RUN wget http://mirrors.kernel.org/ubuntu/pool/universe/e/efitools/efitools_1.8.1-0u… && sudo dpkg -i efitools_1.8.1-0ubuntu2_amd64.deb && rm efitools_1.8.1-0ubuntu2_amd64.deb +# Manually install a new enough version of sbsigntools (must be v0.9.4 or later) +RUN git clone https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git /tmp/sbsigntools && \ + cd /tmp/sbsigntools && \ + git checkout -b latest v0.9.4 && \ + ./autogen.sh && \ + ./configure && \ + make && \ + make install && \ + rm -rf /tmp/sbsigntools + # Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ cd /tmp/grub && \ -- 2.27.0

2 2

[PATCH v2 00/19] arm: mach-k3: Initial support for Texas Instrument's J7200 Platform
by Lokesh Vutla 06 Aug '20

06 Aug '20

This series adds initial support for latest new SoC, J7200, from Texas Instruments. The J7200 SoC is a part of the K3 Multicore SoC architecture platform. It is targeted for for automotive gateway, vehicle compute systems, Vehicle-to-Vehicle (V2V) and Vehicle-to-Everything (V2X) applications. The SoC aims to meet the complex processing needs of modern embedded products. See J7200 Technical Reference Manual (SPRUIU1, June 2020) for further details: https://www.ti.com/lit/pdf/spruiu1 Changes since v2: - Rebased on top of latest master - Addressed comments form Suman and Vignesh Changes since v1: - Updated compatible for sdhci - Enabled CONFIG_OF_BOARD_SETUP for fixuping up msmc dt node. - Split R5 dts and A72 dts Dave Gerlach (1): arm: dts: k3-j7200: Add R5 specific dts support Jean-Jacques Hiblot (1): arm: mach-k3: Fix platform hang when SPL_MULTI_DTB_FIT is not enabled Kishon Vijay Abraham I (1): soc: soc_ti_k3: Add device identification for J7200 SoC Lokesh Vutla (15): board: ti: board_detect: Add stub functions for EEPROM detection apis board: ti: j721e: Probe eeprom only when CONFIG_TI_I2C_BOARD_DETECT is defined arm: mach-k3: Move mmr_unlock to a common location arm: mach-k3: sysfw-loader: Add support for rom loading sysfw image arm: mach-k3: j721e: Add detection for j721e arm: mach-k3: j721e: Fix unlocking control module registers arm: mach-k3: j7200: Add support for SOC detection arm: mach-k3: j7200: Add support for storing extended boot info from ROM arm: mach-k3: j7200: Detect if ROM has already loaded sysfw board: ti: j7200: Introduce support for j7200 build targets board: ti: j7200: Add board detection support for j7200 ram: k3-j721e: Relax version checks for memory controller arm: dts: k3-j7200: Add dts support configs: j7200_evm_r5: Add initial support configs: j7200_evm_a72: Add Initial support Suman Anna (1): board: ti: j721e: Update fdt fixup logic for interconnect nodes arch/arm/dts/Makefile | 4 +- .../k3-j7200-common-proc-board-u-boot.dtsi | 104 + arch/arm/dts/k3-j7200-common-proc-board.dts | 123 + arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi | 2195 +++++++++++++++++ arch/arm/dts/k3-j7200-main.dtsi | 313 +++ arch/arm/dts/k3-j7200-mcu-wakeup.dtsi | 117 + .../arm/dts/k3-j7200-r5-common-proc-board.dts | 199 ++ arch/arm/dts/k3-j7200-som-p0.dtsi | 29 + arch/arm/dts/k3-j7200.dtsi | 175 ++ arch/arm/mach-k3/am6_init.c | 12 +- arch/arm/mach-k3/common.c | 38 + arch/arm/mach-k3/common.h | 6 + arch/arm/mach-k3/config.mk | 8 +- arch/arm/mach-k3/include/mach/hardware.h | 8 + .../arm/mach-k3/include/mach/j721e_hardware.h | 3 + arch/arm/mach-k3/include/mach/sys_proto.h | 3 + arch/arm/mach-k3/include/mach/sysfw-loader.h | 4 +- arch/arm/mach-k3/j721e_init.c | 30 +- arch/arm/mach-k3/sysfw-loader.c | 56 +- board/ti/common/board_detect.h | 13 + board/ti/j721e/Kconfig | 53 + board/ti/j721e/evm.c | 25 +- configs/j7200_evm_a72_defconfig | 175 ++ configs/j7200_evm_r5_defconfig | 130 + drivers/ram/k3-j721e/lpddr4.c | 16 +- drivers/soc/soc_ti_k3.c | 4 + include/configs/j721e_evm.h | 4 +- 27 files changed, 3776 insertions(+), 71 deletions(-) create mode 100644 arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi create mode 100644 arch/arm/dts/k3-j7200-common-proc-board.dts create mode 100644 arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi create mode 100644 arch/arm/dts/k3-j7200-main.dtsi create mode 100644 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi create mode 100644 arch/arm/dts/k3-j7200-r5-common-proc-board.dts create mode 100644 arch/arm/dts/k3-j7200-som-p0.dtsi create mode 100644 arch/arm/dts/k3-j7200.dtsi create mode 100644 configs/j7200_evm_a72_defconfig create mode 100644 configs/j7200_evm_r5_defconfig -- 2.23.0

3 26

crash with CONFIG_OF_LIVE
by Frank Wunderlich 06 Aug '20

06 Aug '20

Hi, i need of_find_property function so i added CONFIG_OF_LIVE. with this my uboot crash on bpi-r64 (own 32bit-config) before calling anything in my driver (is an ahci-driver which is triggered by "scsi scan"). so only the inclusion of CONFIG_OF_LIVE. do i miss anything or have anyone else this issue? Just for reference my current tree https://github.com/frank-w/u-boot/commits/2020-07-bpi-r64-pciev2 regards Frank

1 2

RISC-V: crash in riscv_get_time()
by Heinrich Schuchardt 06 Aug '20

06 Aug '20

Hello Rick, hello Bin, when I run qemu-riscv64_defconfig using qemu-system-riscv64 -machine virt -m 1G -nographic \ -bios u-boot \ -device virtio-net-device,netdev=net0 \ -netdev user,id=net0,tftp=tftp a crash occurs in riscv_get_time() when executing readq(). $ qemu-system-riscv64 --version QEMU emulator version 5.0.0 (Debian 1:5.0-13) Looking at doc/board/emulation/qemu-riscv.rst this should work. Is there something missing in the documentation? Best regards Heinrich

1 0

[PATCH v2] cmd: exception: unaligned data access on RISC-V
by Heinrich Schuchardt 06 Aug '20

06 Aug '20

The command 'exception' can be used to test the handling of exceptions. Currently the exception command only allows to create an illegal instruction exception on RISC-V. Provide a sub-command 'exception unaligned' to cause a misaligned load address exception. Adjust the online help for 'exception undefined'. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2: If unaligned access is support, print success message. --- cmd/riscv/exception.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c index 3c8dbbec0e..9687cec812 100644 --- a/cmd/riscv/exception.c +++ b/cmd/riscv/exception.c @@ -8,6 +8,18 @@ #include <common.h> #include <command.h> +static int do_unaligned(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + asm volatile ( + "auipc a1, 0\n" + "ori a1, a1, 3\n" + "lw a2, (0)(a1)\n" + ); + printf("The system supports unaligned access.\n"); + return CMD_RET_SUCCESS; +} + static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -16,6 +28,8 @@ static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc, } static struct cmd_tbl cmd_sub[] = { + U_BOOT_CMD_MKENT(unaligned, CONFIG_SYS_MAXARGS, 1, do_unaligned, + "", ""), U_BOOT_CMD_MKENT(undefined, CONFIG_SYS_MAXARGS, 1, do_undefined, "", ""), }; @@ -23,7 +37,8 @@ static struct cmd_tbl cmd_sub[] = { static char exception_help_text[] = "<ex>\n" " The following exceptions are available:\n" - " undefined - undefined instruction\n" + " undefined - illegal instruction\n" + " unaligned - load address misaligned\n" ; #include <exception.h> -- 2.27.0

1 0

Re: [PATCH] common/board_f: make sure to call fix_fdt() before reserve_fdt()
by Rick Chen 06 Aug '20

06 Aug '20

Hi Pragnesh > From: Pragnesh Patel [mailto:pragnesh.patel@sifive.com] > Sent: Wednesday, August 05, 2020 5:01 PM > To: atish.patra(a)wdc.com; bmeng.cn(a)gmail.com; u-boot(a)lists.denx.de; anup.patel(a)wdc.com; sagar.kadam(a)sifive.com; Rick Jian-Zhi Chen(陳建志) > Cc: paul.walmsley(a)sifive.com; Pragnesh Patel; Simon Glass; Ovidiu Panait; Stephen Warren; Patrick Delaunay; Vikas Manocha; Masahiro Yamada; Ye Li > Subject: [PATCH] common/board_f: make sure to call fix_fdt() before reserve_fdt() > > There may be a chance that board specific fix_fdt() will change the size of FDT blob so it's safe to call reserve_fdt() after fix_fdt() otherwise global data (gd) will overwrite with FDT blob values. > > Signed-off-by: Pragnesh Patel <pragnesh.patel(a)sifive.com> > --- > common/board_f.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > Maybe you can add the fix tag if it is caused by this. Fixes: a8492e25ac71 ("riscv: Expand the DT size before copy reserved memory node") Reviewed-by: Rick Chen <rick(a)andestech.com> > diff --git a/common/board_f.c b/common/board_f.c index 88ff0424a7..7ae01e9fff 100644 > --- a/common/board_f.c > +++ b/common/board_f.c > @@ -956,6 +956,9 @@ static const init_fnc_t init_sequence_f[] = { > * - board info struct > */ > setup_dest_addr, > +#ifdef CONFIG_OF_BOARD_FIXUP > + fix_fdt, > +#endif > #ifdef CONFIG_PRAM > reserve_pram, > #endif > @@ -984,9 +987,6 @@ static const init_fnc_t init_sequence_f[] = { > setup_board_part2, > #endif > display_new_sp, > -#ifdef CONFIG_OF_BOARD_FIXUP > - fix_fdt, > -#endif > INIT_FUNC_WATCHDOG_RESET > reloc_fdt, > reloc_bootstage, > -- > 2.17.1

3 3

Re: [PATCH 6/6] riscv: sifive/fu540: Move SPL related functions to spl.c
by Rick Chen 06 Aug '20

06 Aug '20

> From: Bin Meng [mailto:bmeng.cn@gmail.com] > Sent: Monday, August 03, 2020 2:09 PM > To: Rick Jian-Zhi Chen(陳建志); Pragnesh Patel; U-Boot Mailing List > Cc: Bin Meng > Subject: [PATCH 6/6] riscv: sifive/fu540: Move SPL related functions to spl.c > > From: Bin Meng <bin.meng(a)windriver.com> > > It's better to keep all SPL related functions in the same spl.c. > > Signed-off-by: Bin Meng <bin.meng(a)windriver.com> > --- > > board/sifive/fu540/fu540.c | 33 --------------------------------- > board/sifive/fu540/spl.c | 33 ++++++++++++++++++++++++++++++++- > 2 files changed, 32 insertions(+), 34 deletions(-) > > diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c index 57753ba..54e5a4c 100644 > --- a/board/sifive/fu540/fu540.c > +++ b/board/sifive/fu540/fu540.c > @@ -13,7 +13,6 @@ > #include <linux/bitops.h> > #include <linux/bug.h> > #include <linux/delay.h> > -#include <linux/io.h> > #include <misc.h> > #include <spl.h> > #include <asm/arch/cache.h> > @@ -127,35 +126,3 @@ int board_init(void) > > return 0; > } > - > -#ifdef CONFIG_SPL > -#define MODE_SELECT_REG 0x1000 > -#define MODE_SELECT_QSPI 0x6 > -#define MODE_SELECT_SD 0xb > -#define MODE_SELECT_MASK GENMASK(3, 0) > - > -u32 spl_boot_device(void) > -{ > - u32 mode_select = readl((void *)MODE_SELECT_REG); > - u32 boot_device = mode_select & MODE_SELECT_MASK; > - > - switch (boot_device) { > - case MODE_SELECT_QSPI: > - return BOOT_DEVICE_SPI; > - case MODE_SELECT_SD: > - return BOOT_DEVICE_MMC1; > - default: > - debug("Unsupported boot device 0x%x but trying MMC1\n", > - boot_device); > - return BOOT_DEVICE_MMC1; > - } > -} > -#endif > - > -#ifdef CONFIG_SPL_LOAD_FIT > -int board_fit_config_name_match(const char *name) -{ > - /* boot using first FIT config */ > - return 0; > -} > -#endif > diff --git a/board/sifive/fu540/spl.c b/board/sifive/fu540/spl.c index 135e118..fe27316 100644 > --- a/board/sifive/fu540/spl.c > +++ b/board/sifive/fu540/spl.c > @@ -11,11 +11,17 @@ > #include <misc.h> > #include <log.h> > #include <linux/delay.h> > +#include <linux/io.h> > #include <asm/gpio.h> > #include <asm/arch/gpio.h> > #include <asm/arch/spl.h> > > -#define GEM_PHY_RESET SIFIVE_GENERIC_GPIO_NR(0, 12) > +#define GEM_PHY_RESET SIFIVE_GENERIC_GPIO_NR(0, 12) > + > +#define MODE_SELECT_REG 0x1000 > +#define MODE_SELECT_QSPI 0x6 > +#define MODE_SELECT_SD 0xb > +#define MODE_SELECT_MASK GENMASK(3, 0) > > int spl_board_init_f(void) > { > @@ -55,3 +61,28 @@ int spl_board_init_f(void) > > return 0; > } > + > +u32 spl_boot_device(void) > +{ > + u32 mode_select = readl((void *)MODE_SELECT_REG); > + u32 boot_device = mode_select & MODE_SELECT_MASK; > + > + switch (boot_device) { > + case MODE_SELECT_QSPI: > + return BOOT_DEVICE_SPI; > + case MODE_SELECT_SD: > + return BOOT_DEVICE_MMC1; > + default: > + debug("Unsupported boot device 0x%x but trying MMC1\n", > + boot_device); > + return BOOT_DEVICE_MMC1; > + } > +} > + > +#ifdef CONFIG_SPL_LOAD_FIT > +int board_fit_config_name_match(const char *name) { > + /* boot using first FIT config */ > + return 0; > +} > +#endif > -- WARNING: Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible #216: FILE: board/sifive/fu540/spl.c:82: +#ifdef CONFIG_SPL_LOAD_FIT LGTM. Other than that, Reviewed-by: Rick Chen <rick(a)andestech.com>

2 1

[PATCH v2] common/board_f: make sure to call fix_fdt() before reserve_fdt()
by Pragnesh Patel 06 Aug '20

06 Aug '20

There may be a chance that board specific fix_fdt() will change the size of FDT blob so it's safe to call reserve_fdt() after fix_fdt() otherwise global data (gd) will overwrite with FDT blob values. Fixes: a8492e25ac71 ("riscv: Expand the DT size before copy reserved memory node") Signed-off-by: Pragnesh Patel <pragnesh.patel(a)sifive.com> Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Rick Chen <rick(a)andestech.com> --- common/board_f.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 88ff0424a7..7ae01e9fff 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -956,6 +956,9 @@ static const init_fnc_t init_sequence_f[] = { * - board info struct */ setup_dest_addr, +#ifdef CONFIG_OF_BOARD_FIXUP + fix_fdt, +#endif #ifdef CONFIG_PRAM reserve_pram, #endif @@ -984,9 +987,6 @@ static const init_fnc_t init_sequence_f[] = { setup_board_part2, #endif display_new_sp, -#ifdef CONFIG_OF_BOARD_FIXUP - fix_fdt, -#endif INIT_FUNC_WATCHDOG_RESET reloc_fdt, reloc_bootstage, -- 2.17.1

1 0

[PATCH 1/6] riscv: Call spl_board_init_f() in the generic SPL board_init_f()
by Bin Meng 06 Aug '20

06 Aug '20

From: Bin Meng <bin.meng(a)windriver.com> The generic SPL version of board_init_f() should give a call to board specific codes to initialize board in the SPL phase. Signed-off-by: Bin Meng <bin.meng(a)windriver.com> --- arch/riscv/include/asm/spl.h | 7 +++++++ arch/riscv/lib/spl.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/riscv/include/asm/spl.h b/arch/riscv/include/asm/spl.h index 45c03fb..1487f2d 100644 --- a/arch/riscv/include/asm/spl.h +++ b/arch/riscv/include/asm/spl.h @@ -28,4 +28,11 @@ enum { BOOT_DEVICE_NONE }; +/** + * spl_board_init_f() - initialize board in the SPL phase + * + * @return 0 if succeeded, -ve on error + */ +int spl_board_init_f(void); + #endif diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c index c47dcd4..e24ec5a 100644 --- a/arch/riscv/lib/spl.c +++ b/arch/riscv/lib/spl.c @@ -13,6 +13,11 @@ DECLARE_GLOBAL_DATA_PTR; +__weak int spl_board_init_f(void) +{ + return 0; +} + __weak void board_init_f(ulong dummy) { int ret; @@ -24,6 +29,10 @@ __weak void board_init_f(ulong dummy) arch_cpu_init_dm(); preloader_console_init(); + + ret = spl_board_init_f(); + if (ret) + panic("spl_board_init_f() failed: %d\n", ret); } void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) -- 2.7.4

3 13

Re: [PATCH 5/6] riscv: sifive/fu540: Drop NET_RANDOM_ETHADDR
by Rick Chen 06 Aug '20

06 Aug '20

> From: Bin Meng [mailto:bmeng.cn@gmail.com] > Sent: Monday, August 03, 2020 2:09 PM > To: Rick Jian-Zhi Chen(陳建志); Pragnesh Patel; U-Boot Mailing List > Cc: Bin Meng > Subject: [PATCH 5/6] riscv: sifive/fu540: Drop NET_RANDOM_ETHADDR > > From: Bin Meng <bin.meng(a)windriver.com> > > This option was enabled during the earlier U-Boot porting time. Now we already have the OTP driver in place and the unique MAC address is read from the OTP, there is no need to turn on this option. > > Signed-off-by: Bin Meng <bin.meng(a)windriver.com> > --- > > board/sifive/fu540/Kconfig | 1 - > 1 file changed, 1 deletion(-) Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0