December 2019 - U-Boot

Re: [PATCH 1/1] doc: fix AX25-AE350 RISC-V documentation
by Rick Chen 31 Dec '19

31 Dec '19

> From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Jagan Teki > Sent: Monday, December 30, 2019 9:14 PM > To: Heinrich Schuchardt > Cc: Tom Rini; U-Boot-Denx > Subject: Re: [PATCH 1/1] doc: fix AX25-AE350 RISC-V documentation > > On Sat, Dec 28, 2019 at 12:21 AM Heinrich Schuchardt <xypron.glpk(a)gmx.de> > wrote: > > > > Since commit 04883bf7acca ("doc: update AX25-AE350 RISC-V > > documentation") `make htmldocs` produces a log of warnings like > > > > doc/board/AndesTech/ax25-ae350.rst:373: > > WARNING: Block quote ends without a blank line; unexpected unindent. > > doc/board/AndesTech/ax25-ae350.rst:0: > > WARNING: Undefined substitution referenced: "_ __ ___ _ __ | (___ | |_) |". > > > > Reformat the problematic passages. > > > > Fixes: 04883bf7acca ("doc: update AX25-AE350 RISC-V documentation") > > Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > > --- > > Reviewed-by: Jagan Teki <jagan(a)amarulasolutions.com> Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

Re: [PATCH] doc: fix opensbi build steps for AX25-AE350
by Rick Chen 31 Dec '19

31 Dec '19

> From: Jagan Teki [mailto:jagan@amarulasolutions.com] > Sent: Monday, December 30, 2019 10:29 PM > To: Rick Jian-Zhi Chen(陳建志); Bin Meng > Cc: u-boot(a)lists.denx.de; Jagan Teki; Heinrich Schuchardt > Subject: [PATCH] doc: fix opensbi build steps for AX25-AE350 > > OpenSBI build steps are marked as normal text in > AX25-AE350 documentation. > > Move them into code-block so-that it can show it as build steps. > > Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> Reviewed-by: Rick Chen <rick(a)andestech.com> > --- > doc/board/AndesTech/ax25-ae350.rst | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/doc/board/AndesTech/ax25-ae350.rst b/doc/board/AndesTech/ax25-ae350.rst > index 89c485f88f..f795476d85 100644 > --- a/doc/board/AndesTech/ax25-ae350.rst > +++ b/doc/board/AndesTech/ax25-ae350.rst > @@ -337,9 +337,11 @@ How to build U-Boot SPL Before building U-Boot SPL, OpenSBI must be build first. OpenSBI can be cloned and build for AE350 as below: > > -git clone https://github.com/riscv/opensbi.git > -cd opensbi > -make PLATFORM=andes/ae350 > +.. code-block:: none > + > + git clone https://github.com/riscv/opensbi.git > + cd opensbi > + make PLATFORM=andes/ae350 > > Copy OpenSBI FW_DYNAMIC image (build\platform\andes\ae350\firmware\fw_dynamic.bin) > into U-Boot root directory > -- > 2.18.0.321.gffc6fa0e3

1 0

[PATCH 1/1] MAINTAINERS: assign drivers/rng/
by Heinrich Schuchardt 30 Dec '19

30 Dec '19

With upcoming patches we will have drivers for the hardware random number generators in drivers/rng/. As the UEFI sub-system will be the first user of these drivers I would like to pick up the maintainership. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 438fb225ab..78d4c24d33 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -781,6 +781,13 @@ F: arch/riscv/ F: cmd/riscv/ F: tools/prelink-riscv.c +RNG +M: Heinrich Schuchardt <xypron.glpk(a)gmx.de> +S: Maintained +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git +F: drivers/rng/ +F: drivers/virtio/virtio_rng.c + ROCKUSB M: Eddie Cai <eddie.cai.linux(a)gmail.com> S: Maintained -- 2.24.1

1 0

[PATCH v8 0/8] Add a random number generator uclass
by Sughosh Ganu 30 Dec '19

30 Dec '19

Add a random number generator(rng) uclass to facilitate adding drivers for rng devices. I plan to add an implementation of the EFI_RNG_PROTOCOL, which would get the random number from the rng uclass -- the protocol would be used by the efi stub for getting a random number for the kaslr feature. The patch series also adds a driver for the rng device found on the stm32mp1 and qemu platforms. A dummy rng driver for sandbox has also been added, along with the unit test for the rng uclass. Changes since V7: * Set the length to min(len, sizeof(buf)) to avoid a buffer overrun. Changes since V6: * Handle review comments from Heinrich Schuchardt to handle the scenario of data buffer being passed to the virtio rng driver not being aligned on 4 bytes. * Handle review comment by Simon Glass to only keep a forward declaration of struct udevice in rng.h. Changes since V5: * Handle review comments from Heinrich Schuchardt to read all the bytes requested in the individual drivers. Changes since V4: * Get the read functions of individual drivers to return number of bytes read on successful read, and a -ve value on error. * Handle review comments from Heinrich Schuchardt. Changes since V3: * Handle review comments from Patrick Delaunay Changes since V2: * Add a driver for the virtio-rng device on qemu platform Changes since V1: * Add a SPDX header in rng.h * Change the UCLASS_DRIVER name from hwrng to rng, consistent with the rest of the naming convention * Handle review comment from Patrice Chotard Sughosh Ganu (8): dm: rng: Add random number generator(rng) uclass clk: stm32mp1: Add a clock entry for RNG1 device stm32mp1: rng: Add a driver for random number generator(rng) device configs: stm32mp15: Enable random number generator(rng) device sandbox: rng: Add a random number generator(rng) driver configs: sandbox: Enable random number generator(rng) device test: rng: Add basic test for random number generator(rng) uclass virtio: rng: Add a random number generator(rng) driver arch/sandbox/dts/test.dts | 4 + configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + configs/stm32mp15_basic_defconfig | 2 + configs/stm32mp15_optee_defconfig | 2 + configs/stm32mp15_trusted_defconfig | 2 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/clk/clk_stm32mp1.c | 1 + drivers/rng/Kconfig | 22 +++++ drivers/rng/Makefile | 8 ++ drivers/rng/rng-uclass.c | 23 ++++++ drivers/rng/sandbox_rng.c | 56 +++++++++++++ drivers/rng/stm32mp1_rng.c | 161 ++++++++++++++++++++++++++++++++++++ drivers/virtio/Kconfig | 6 ++ drivers/virtio/Makefile | 1 + drivers/virtio/virtio-uclass.c | 1 + drivers/virtio/virtio_rng.c | 88 ++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/rng.h | 33 ++++++++ include/virtio.h | 4 +- test/dm/Makefile | 1 + test/dm/rng.c | 26 ++++++ 23 files changed, 448 insertions(+), 1 deletion(-) create mode 100644 drivers/rng/Kconfig create mode 100644 drivers/rng/Makefile create mode 100644 drivers/rng/rng-uclass.c create mode 100644 drivers/rng/sandbox_rng.c create mode 100644 drivers/rng/stm32mp1_rng.c create mode 100644 drivers/virtio/virtio_rng.c create mode 100644 include/rng.h create mode 100644 test/dm/rng.c -- 2.7.4

2 9

[PATCH] include: fix 'ulong' definition on musl targets
by Sergei Trofimovich 30 Dec '19

30 Dec '19

The build failure was originally reported on arm64-musl target at https://bugs.gentoo.org/703132. Here is the amd64-musl variant: ``` $ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-only_defconfig -j$(nproc) $ LANG=C make CROSS_COMPILE=x86_64-gentoo-linux-musl- tools-all -j$(nproc) ... In file included from tools/env/../../env/flags.c:7, from tools/env/env_flags.c:1: include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'? 159 | ulong env_get_ulong(const char *name, int base, ulong default_val); | ^~~~~ | long ``` Note: 'ulong' is not defined there. On glibc 'ulong' comes from <sys/types.h>: ```c /* Old compatibility names for C types. */ typedef unsigned long int ulong; ``` On musl it comes from <sys/types.h> as well but from under different guards: ```c typedef unsigned long u_long, ulong; ``` The change inlines 'ulong' define similar to 'uint' define. Bug: https://bugs.gentoo.org/703132 Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> --- include/compiler.h | 2 +- include/u-boot/crc.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/compiler.h b/include/compiler.h index 29507f9840..90372f239c 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -46,7 +46,6 @@ # include <byteswap.h> #elif defined(__MACH__) || defined(__FreeBSD__) # include <machine/endian.h> -typedef unsigned long ulong; #endif #ifdef __FreeBSD__ # include <sys/endian.h> /* htole32 and friends */ @@ -66,6 +65,7 @@ typedef uint8_t __u8; typedef uint16_t __u16; typedef uint32_t __u32; typedef unsigned int uint; +typedef unsigned long ulong; #define uswap_16(x) \ ((((x) & 0xff00) >> 8) | \ diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h index 1086d2168c..b96b50d98b 100644 --- a/include/u-boot/crc.h +++ b/include/u-boot/crc.h @@ -8,6 +8,8 @@ #ifndef _UBOOT_CRC_H #define _UBOOT_CRC_H +#include <compiler.h> /* unit definition */ + /** * crc8() - Calculate and return CRC-8 of the data * -- 2.24.1

2 5

[PATCH v1] Revert "core: device: use dev_power_domain_on"
by Igor Opaniuk 30 Dec '19

30 Dec '19

From: Igor Opaniuk <igor.opaniuk(a)toradex.com> This reverts commit f0cc4eae9a1702a768817ea25d9f23cece69d021 This was previously reported that f0cc4eae9a ("core: device: use dev_power_domain_on") breaks initial boot on Colibri iMX8X and IMX8 QM ROM 7720a1 board. Revert it until the problem is properly fixed. Signed-off-by: Igor Opaniuk <igor.opaniuk(a)toradex.com> --- drivers/core/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/core/device.c b/drivers/core/device.c index 4e037083a6..c5b232c259 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -313,6 +313,7 @@ static void *alloc_priv(int size, uint flags) int device_probe(struct udevice *dev) { + struct power_domain pd; const struct driver *drv; int size = 0; int ret; @@ -396,9 +397,8 @@ int device_probe(struct udevice *dev) if (CONFIG_IS_ENABLED(POWER_DOMAIN) && dev->parent && (device_get_uclass_id(dev) != UCLASS_POWER_DOMAIN) && !(drv->flags & DM_FLAG_DEFAULT_PD_CTRL_OFF)) { - ret = dev_power_domain_on(dev); - if (ret) - goto fail; + if (!power_domain_get(dev, &pd)) + power_domain_on(&pd); } ret = uclass_pre_probe_device(dev); -- 2.17.1

6 7

[PATCH] tools: imx8m_image: Change source path for DDR firmware to build dir
by Schrempf Frieder 30 Dec '19

30 Dec '19

From: Frieder Schrempf <frieder.schrempf(a)kontron.de> The DDR firmware binaries are not part of the U-Boot source code, so we should look for them in the build directory, where they need to be copied to before building U-Boot. The ATF binary is already fetched from the build directory, but the README files for the i.MX8M EVKs claim that it needs to be copied to the source directory (which is still true for in-tree builds, but not in general). Therefore we also fix the READMEs to use the build directory as the correct location for all additional binary files. Sined-off-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> --- board/freescale/imx8mm_evk/README | 6 +++--- board/freescale/imx8mq_evk/README | 8 ++++---- tools/imx8m_image.sh | 28 +++++++++++----------------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/board/freescale/imx8mm_evk/README b/board/freescale/imx8mm_evk/README index a885bc5c97..c908c0adc4 100644 --- a/board/freescale/imx8mm_evk/README +++ b/board/freescale/imx8mm_evk/README @@ -9,18 +9,18 @@ Quick Start Get and Build the ARM Trusted firmware ====================================== -Note: srctree is U-Boot source directory +Note: builddir is U-Boot build directory (source directory for in-tree builds) Get ATF from: https://source.codeaurora.org/external/imx/imx-atf branch: imx_4.19.35_1.0.0 $ make PLAT=imx8mm bl31 -$ cp build/imx8mm/release/bl31.bin $(srctree) +$ cp build/imx8mm/release/bl31.bin $(builddir) Get the ddr and hdmi firmware ============================= $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.0.bin $ chmod +x firmware-imx-8.0.bin $ ./firmware-imx-8.0 -$ cp firmware-imx-7.9/firmware/ddr/synopsys/lpddr4*.bin $(srctree) +$ cp firmware-imx-7.9/firmware/ddr/synopsys/lpddr4*.bin $(builddir) Build U-Boot ============ diff --git a/board/freescale/imx8mq_evk/README b/board/freescale/imx8mq_evk/README index c1d400bcf9..bbf69c60d8 100644 --- a/board/freescale/imx8mq_evk/README +++ b/board/freescale/imx8mq_evk/README @@ -9,19 +9,19 @@ Quick Start Get and Build the ARM Trusted firmware ====================================== -Note: srctree is U-Boot source directory +Note: builddir is U-Boot build directory (source directory for in-tree builds) Get ATF from: https://source.codeaurora.org/external/imx/imx-atf branch: imx_4.14.62_1.0.0_beta $ make PLAT=imx8mq bl31 -$ cp build/imx8mq/release/bl31.bin $(srctree) +$ cp build/imx8mq/release/bl31.bin $(builddir) Get the ddr and hdmi firmware ============================= $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.9.bin $ chmod +x firmware-imx-7.9.bin $ ./firmware-imx-7.9.bin -$ cp firmware-imx-7.9/firmware/hdmi/cadence/signed_hdmi_imx8m.bin $(srctree) -$ cp firmware-imx-7.9/firmware/ddr/synopsys/lpddr4*.bin $(srctree) +$ cp firmware-imx-7.9/firmware/hdmi/cadence/signed_hdmi_imx8m.bin $(builddir) +$ cp firmware-imx-7.9/firmware/ddr/synopsys/lpddr4*.bin $(builddir) Build U-Boot ============ diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh index 603ba6e8f4..4959f9c835 100755 --- a/tools/imx8m_image.sh +++ b/tools/imx8m_image.sh @@ -10,41 +10,35 @@ post_process=$2 blobs=`awk '/^SIGNED_HDMI/ {print $2} /^LOADER/ {print $2} /^SECOND_LOADER/ {print $2} /^DDR_FW/ {print $2}' $file` for f in $blobs; do - tmp=$srctree/$f - if [ $f = "spl/u-boot-spl-ddr.bin" ] || [ $f = "u-boot.itb" ]; then continue fi if [ -f $f ]; then continue - fi - - if [ ! -f $tmp ]; then + else echo "WARNING '$tmp' not found, resulting binary is not-functional" >&2 exit 1 fi - - sed -in "s;$f;$tmp;" $file done if [ $post_process = 1 ]; then - if [ -f $srctree/lpddr4_pmu_train_1d_imem.bin ]; then - objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 $srctree/lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin - objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 $srctree/lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin - objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 $srctree/lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_imem_pad.bin + if [ -f lpddr4_pmu_train_1d_imem.bin ]; then + objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin + objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin + objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_imem_pad.bin cat lpddr4_pmu_train_1d_imem_pad.bin lpddr4_pmu_train_1d_dmem_pad.bin > lpddr4_pmu_train_1d_fw.bin - cat lpddr4_pmu_train_2d_imem_pad.bin $srctree/lpddr4_pmu_train_2d_dmem.bin > lpddr4_pmu_train_2d_fw.bin + cat lpddr4_pmu_train_2d_imem_pad.bin lpddr4_pmu_train_2d_dmem.bin > lpddr4_pmu_train_2d_fw.bin dd if=spl/u-boot-spl.bin of=spl/u-boot-spl-pad.bin bs=4 conv=sync cat spl/u-boot-spl-pad.bin lpddr4_pmu_train_1d_fw.bin lpddr4_pmu_train_2d_fw.bin > spl/u-boot-spl-ddr.bin rm -f lpddr4_pmu_train_1d_fw.bin lpddr4_pmu_train_2d_fw.bin lpddr4_pmu_train_1d_imem_pad.bin lpddr4_pmu_train_1d_dmem_pad.bin lpddr4_pmu_train_2d_imem_pad.bin spl/u-boot-spl-pad.bin fi - if [ -f $srctree/ddr4_imem_1d.bin ]; then - objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 $srctree/ddr4_imem_1d.bin ddr4_imem_1d_pad.bin - objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 $srctree/ddr4_dmem_1d.bin ddr4_dmem_1d_pad.bin - objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 $srctree/ddr4_imem_2d.bin ddr4_imem_2d_pad.bin + if [ -f ddr4_imem_1d.bin ]; then + objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ddr4_imem_1d.bin ddr4_imem_1d_pad.bin + objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 ddr4_dmem_1d.bin ddr4_dmem_1d_pad.bin + objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ddr4_imem_2d.bin ddr4_imem_2d_pad.bin cat ddr4_imem_1d_pad.bin ddr4_dmem_1d_pad.bin > ddr4_1d_fw.bin - cat ddr4_imem_2d_pad.bin $srctree/ddr4_dmem_2d.bin > ddr4_2d_fw.bin + cat ddr4_imem_2d_pad.bin ddr4_dmem_2d.bin > ddr4_2d_fw.bin dd if=spl/u-boot-spl.bin of=spl/u-boot-spl-pad.bin bs=4 conv=sync cat spl/u-boot-spl-pad.bin ddr4_1d_fw.bin ddr4_2d_fw.bin > spl/u-boot-spl-ddr.bin rm -f ddr4_1d_fw.bin ddr4_2d_fw.bin ddr4_imem_1d_pad.bin ddr4_dmem_1d_pad.bin ddr4_imem_2d_pad.bin spl/u-boot-spl-pad.bin -- 2.17.1

4 5

[U-Boot] [PATCH v2 1/3] mach-imx: bootaux: print stack pointer and reset vector
by Igor Opaniuk 30 Dec '19

30 Dec '19

From: Igor Opaniuk <igor.opaniuk(a)toradex.com> 1. Change information printed about loaded M4 binary, print the stack pointer and reset vector addressed. 2. Add sanity check for the address provided as param. Signed-off-by: Igor Opaniuk <igor.opaniuk(a)toradex.com> --- arch/arm/mach-imx/imx_bootaux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 3d9422d5a2..ee786f7d06 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -20,6 +20,9 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data) stack = *(u32 *)boot_private_data; pc = *(u32 *)(boot_private_data + 4); + printf("## Starting auxiliary core stack = 0x%08lX, pc = 0x%08lX...\n", + stack, pc); + /* Set the stack and pc to M4 bootROM */ writel(stack, M4_BOOTROM_BASE_ADDR); writel(pc, M4_BOOTROM_BASE_ADDR + 4); @@ -80,7 +83,8 @@ static int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) addr = simple_strtoul(argv[1], NULL, 16); - printf("## Starting auxiliary core at 0x%08lX ...\n", addr); + if (!addr) + return CMD_RET_FAILURE; ret = arch_auxiliary_core_up(0, addr); if (ret) -- 2.17.1

4 11

[PATCH 1/1] travis-ci: provide env__efi_fit_tftp_file
by Heinrich Schuchardt 30 Dec '19

30 Dec '19

Provide dictionary env__efi_fit_tftp_file describing the file used for the UEFI FIT image test. Cf. "test/py: Create a test for launching UEFI binaries from FIT images" https://lists.denx.de/pipermail/u-boot/2019-December/394516.html Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- py/travis-ci/travis_tftp.py | 20 +++++++++++++++++++ py/travis-ci/u_boot_boardenv_qemu_arm64_na.py | 1 + py/travis-ci/u_boot_boardenv_qemu_arm_na.py | 1 + .../u_boot_boardenv_qemu_x86_64_na.py | 2 ++ py/travis-ci/u_boot_boardenv_qemu_x86_na.py | 2 ++ .../u_boot_boardenv_vexpress_ca15_tc2_qemu.py | 1 + .../u_boot_boardenv_vexpress_ca9x4_qemu.py | 1 + 7 files changed, 28 insertions(+) diff --git a/py/travis-ci/travis_tftp.py b/py/travis-ci/travis_tftp.py index 4ea5c06..2ab7740 100644 --- a/py/travis-ci/travis_tftp.py +++ b/py/travis-ci/travis_tftp.py @@ -1,6 +1,26 @@ import os import binascii +def efifit2env(addr=None): + """Create dictionary describing file for UEFI FIT image test + + @addr: address used for loading the file as int (e.g. 0x40400000) + Return: dictionary describing the file with entries + * fn - filename + * addr - loading address, optional + * dn - tftp directory + """ + tftp_dir = os.environ['UBOOT_TRAVIS_BUILD_DIR'] + "/" + + ret = { + "fn": "test-efi-fit.img", + "dn": "tftp_dir", + } + if addr is not None: + ret['addr'] = addr + + return ret + def file2env(file_name, addr=None): """Create dictionary describing file diff --git a/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py b/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py index 2986115..98ce873 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_arm64_na.py @@ -6,3 +6,4 @@ env__net_dhcp_server = True env__net_tftp_readable_file = travis_tftp.file2env('u-boot.bin', 0x40400000) env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi', 0x40400000) env__efi_loader_grub_file = travis_tftp.file2env('grub_arm64.efi', 0x40400000) +env__efi_fit_tftp_file = travis_tftp.efifit2env(0x40400000) diff --git a/py/travis-ci/u_boot_boardenv_qemu_arm_na.py b/py/travis-ci/u_boot_boardenv_qemu_arm_na.py index 391e3c4..3dbedde 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_arm_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_arm_na.py @@ -6,3 +6,4 @@ env__net_dhcp_server = True env__net_tftp_readable_file = travis_tftp.file2env('u-boot.bin', 0x40400000) env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi', 0x40400000) env__efi_loader_grub_file = travis_tftp.file2env('grub_arm.efi', 0x40400000) +env__efi_fit_tftp_file = travis_tftp.efifit2env(0x40400000) diff --git a/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py b/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py index 6f7c593..2fe72c8 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_x86_64_na.py @@ -8,3 +8,5 @@ env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworl env__efi_loader_check_smbios = True env__efi_loader_grub_file = travis_tftp.file2env('grub_x64.efi') + +env__efi_fit_tftp_file = travis_tftp.efifit2env() diff --git a/py/travis-ci/u_boot_boardenv_qemu_x86_na.py b/py/travis-ci/u_boot_boardenv_qemu_x86_na.py index 70dc0ae..62cc279 100644 --- a/py/travis-ci/u_boot_boardenv_qemu_x86_na.py +++ b/py/travis-ci/u_boot_boardenv_qemu_x86_na.py @@ -8,3 +8,5 @@ env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworl env__efi_loader_check_smbios = True env__efi_loader_grub_file = travis_tftp.file2env('grub_x86.efi') + +env__efi_fit_tftp_file = travis_tftp.efifit2env() diff --git a/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py b/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py index 7437ae6..75f287c 100644 --- a/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py +++ b/py/travis-ci/u_boot_boardenv_vexpress_ca15_tc2_qemu.py @@ -5,3 +5,4 @@ env__net_dhcp_server = True env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') env__efi_loader_grub_file = travis_tftp.file2env('grub_arm.efi') +env__efi_fit_tftp_file = travis_tftp.efifit2env() diff --git a/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py b/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py index 7437ae6..75f287c 100644 --- a/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py +++ b/py/travis-ci/u_boot_boardenv_vexpress_ca9x4_qemu.py @@ -5,3 +5,4 @@ env__net_dhcp_server = True env__net_tftp_readable_file = travis_tftp.file2env('u-boot') env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') env__efi_loader_grub_file = travis_tftp.file2env('grub_arm.efi') +env__efi_fit_tftp_file = travis_tftp.efifit2env() -- 2.24.1

2 1

[PATCH v5 0/5] Add support for booting EFI FIT images
by Cristian Ciocaltea 30 Dec '19

30 Dec '19

Currently the only way to run an EFI binary like GRUB2 is via the 'bootefi' command, which cannot be used in a verified boot scenario. The obvious solution to this limitation is to add support for booting FIT images containing those EFI binaries. The implementation relies on a new image type - IH_OS_EFI - which can be created by using 'os = "efi"' inside an ITS file: / { #address-cells = <1>; images { efi-grub { description = "GRUB EFI"; data = /incbin/("bootarm.efi"); type = "kernel_noload"; arch = "arm"; os = "efi"; compression = "none"; load = <0x0>; entry = <0x0>; hash-1 { algo = "sha256"; }; }; }; configurations { default = "config-grub"; config-grub { kernel = "efi-grub"; signature-1 { algo = "sha256,rsa2048"; sign-images = "kernel"; }; }; }; }; The bootm command has been extended to handle the IH_OS_EFI images. To enable this feature, a new configuration option has been added: BOOTM_EFI I tested the solution using the 'qemu_arm' board: => load scsi 0:1 ${kernel_addr_r} efi-image.fit => bootm ${kernel_addr_r}#config-grub Changes in v5: * Update the definition of BOOTM_EFI: move content right after CMD_BOOTM, improve description and help text, fix dependency * Change the type of the 'addr' field inside 'env__efi_fit_tftp_file' dictionary from string to integer, currently tested on: sandbox, qemu_arm, qemu_arm64 Changes in v4: * Extend the python test to also run on real hardware, currently tested on qemu_arm Changes in v3: * Rebase patches on Heinrich Schuchardt's patch series v3: efi_loader: prepare for FIT images https://lists.denx.de/pipermail/u-boot/2019-December/393677.html This fixes implicitly the sandbox issue 'phys_to_virt: Cannot map sandbox address' since efi_install_fdt() is now expecting a pointer to addressable memory instead of a physical address. * Get rid of 'EFI/BOOT/' prefix used in ITS samples * Add a python test to verify the implementation in sandbox environment Changes in v2: * Rebase patches on Heinrich Schuchardt's patch series: efi_loader: prepare for FIT images https://lists.denx.de/pipermail/u-boot/2019-December/393192.html * Add sample configuration: doc/uImage.FIT/uefi.its * Update uefi documentation: doc/uefi/uefi.rst Cristian Ciocaltea (5): image: Add IH_OS_EFI for EFI chain-load boot bootm: Add a bootm command for type IH_OS_EFI doc: Add sample uefi.its image description file doc: uefi.rst: Document launching UEFI binaries from FIT images test/py: Create a test for launching UEFI binaries from FIT images cmd/Kconfig | 7 + common/bootm_os.c | 56 +++++ common/image-fit.c | 3 +- common/image.c | 1 + doc/uImage.FIT/uefi.its | 67 +++++ doc/uefi/uefi.rst | 34 +++ include/image.h | 1 + test/py/tests/test_efi_fit.py | 458 ++++++++++++++++++++++++++++++++++ 8 files changed, 626 insertions(+), 1 deletion(-) create mode 100644 doc/uImage.FIT/uefi.its create mode 100644 test/py/tests/test_efi_fit.py -- 2.17.1

2 6