August 2021 - U-Boot

[PATCH v5 0/5] Enable ECDSA FIT verification for stm32mp
by Alexandru Gagniuc 16 Aug '21

16 Aug '21

This series is based on the following: "[PATCH 00/18] image: Reduce #ifdef abuse in image code" This rebase is awesome because we don't need to change #defines in common code or rely on hidden #ifdefs. Q: Will there be a software-only implementation of ECDSA ? A: That is the goal, so that we can have more extensive testing with the sandbox. I don not have the bandwidth to implement it. There has been an initial poer of software ecdsa here: https://github.com/timr11/u-boot/tree/ecdsa-vrf-1 Q: Can more code be shared with the RSA verification path? A: Probably yes. Mostly having to do with parsing the "/signature" node and "key-name-hint"s in the u-boot FDT. Although there isn't any copypasted RSA code, or code with substantial similarity. Changes since v4: - Use U_BOOT_CRYPTO_ALGO() to add ECDSA to .u_boot_list - No need to #define IMAGE_ENABLE_VERIFY_ECDSA - Use ut_asserteq(x, -ENODEV) instead of ut_assert(x == -ENODEV) Changes since v3: - Remove unused ecdsa_check_key() function Changes since v2: - Spell out "elliptic curve" in Kconfig (Although RSA isn't spelled out) Changes since v1: - Add test to make sure the UCLASS is enabled - Fix check against wrong sig_len in ecdsa_romapi.c - s/U_BOOT_DEVICE/U_BOOT_DRVINFO/ - Use "if(!ret)" instead of "if (ret == 0)" - Use uclass_first_device_err() instead of uclass_first_device() - Make sure #includes are correctly alphabetized Alexandru Gagniuc (5): dm: crypto: Define UCLASS API for ECDSA signature verification lib: ecdsa: Implement UCLASS_ECDSA verification on target arm: stm32mp1: Implement ECDSA signature verification Kconfig: FIT_SIGNATURE should not select RSA_VERIFY test: dm: Add test for ECDSA UCLASS support arch/arm/mach-stm32mp/Kconfig | 9 ++ arch/arm/mach-stm32mp/Makefile | 1 + arch/arm/mach-stm32mp/ecdsa_romapi.c | 102 ++++++++++++++++++++ common/Kconfig.boot | 8 +- configs/sandbox_defconfig | 2 + include/crypto/ecdsa-uclass.h | 39 ++++++++ include/dm/uclass-id.h | 1 + lib/Kconfig | 1 + lib/Makefile | 1 + lib/ecdsa/Kconfig | 23 +++++ lib/ecdsa/Makefile | 1 + lib/ecdsa/ecdsa-verify.c | 134 +++++++++++++++++++++++++++ test/dm/Makefile | 1 + test/dm/ecdsa.c | 39 ++++++++ 14 files changed, 358 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-stm32mp/ecdsa_romapi.c create mode 100644 include/crypto/ecdsa-uclass.h create mode 100644 lib/ecdsa/Kconfig create mode 100644 lib/ecdsa/Makefile create mode 100644 lib/ecdsa/ecdsa-verify.c create mode 100644 test/dm/ecdsa.c -- 2.31.1

5 24

[PATCH] stm32mp: correctly handle board_get_usable_ram_top(0)
by Patrick Delaunay 16 Aug '21

16 Aug '21

The function board_get_usable_ram_top can to called after relocation with total_size = 0 to get the uppermost pointer that is valid to access in U-Boot. When total_size = 0, the reserved memory should be not take in account with lmb library and 'gd->ram_base + gd->ram_size' can be used. It is the case today in lib/efi_loader/efi_memory.c:efi_add_known_memory() and this patch avoids that the reserved memory for OP-TEE is not part of the EFI available memory regions. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- Patch to correct the UEFI support for STM32MP platform after Heinrich's remark on patch [1]. [1] efi_loader: replace board_get_usable_ram_top by gd->ram_top http://patchwork.ozlabs.org/project/uboot/patch/20210709124630.1.I212e7cd96… arch/arm/mach-stm32mp/dram_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c index 3c097029bd..94f25f34e0 100644 --- a/arch/arm/mach-stm32mp/dram_init.c +++ b/arch/arm/mach-stm32mp/dram_init.c @@ -46,6 +46,9 @@ ulong board_get_usable_ram_top(ulong total_size) phys_addr_t reg; struct lmb lmb; + if (!total_size) + return gd->ram_base + gd->ram_size; + /* found enough not-reserved memory to relocated U-Boot */ lmb_init(&lmb); lmb_add(&lmb, gd->ram_base, gd->ram_size); -- 2.25.1

2 2

[PATCH] ARM: dts: stm32: Reduce DHCOR SPI NOR frequency to 50 MHz
by Marek Vasut 16 Aug '21

16 Aug '21

The SPI NOR is a bit further away from the SoC on DHCOR than on DHCOM, which causes additional signal delay. At 108 MHz, this delay triggers a sporadic issue where the first bit of RX data is not received by the QSPI controller. There are two options of addressing this problem, either by using the DLYB block to compensate the extra delay, or by reducing the QSPI bus clock frequency. The former requires calibration and that is overly complex for SPL, so opt for the second option. This incurs 20ms delay during boot, when SPL loads U-Boot to DRAM. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi index 64299df8166..94cf80dbede 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-io3v3.dtsi @@ -198,7 +198,7 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-rx-bus-width = <4>; - spi-max-frequency = <108000000>; + spi-max-frequency = <50000000>; #address-cells = <1>; #size-cells = <1>; }; -- 2.30.2

2 2

[PATCH] ARM: stm32: Set environment sector size to 4k on DHSOM
by Marek Vasut 16 Aug '21

16 Aug '21

The DHSOM SPI NOR is using 4k erase blocks, make use of it and define the default environment sector size to 4k. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- configs/stm32mp15_dhcom_basic_defconfig | 2 +- configs/stm32mp15_dhcor_basic_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index 266fdbd9028..7439cd268f6 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_SYS_MEMTEST_START=0xc0000000 CONFIG_SYS_MEMTEST_END=0xc4000000 CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcom-pdk2" @@ -102,7 +103,6 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y -# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y CONFIG_DWC_ETH_QOS=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index 9a449d76dff..7e2d7fed3d4 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_STM32MP=y CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="stm32mp15xx-dhcor-avenger96" @@ -97,7 +98,6 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y -# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y CONFIG_DWC_ETH_QOS=y -- 2.30.2

2 2

Re: [PATCH v3 3/3] arm: mvebu: Initial ESPRESSOBin-Ultra board support
by Gérald Kerma 16 Aug '21

16 Aug '21

Héllo, > Message: 2 > Date: Fri, 13 Aug 2021 12:03:57 +0200 > From: Luka Kovacic<luka.kovacic(a)sartura.hr> > To: Pali Roh?r<pali(a)kernel.org> > Cc:u-boot@lists.denx.de, Robert Marko<robert.marko(a)sartura.hr>, > Luka Perkov<luka.perkov(a)sartura.hr>, Marek Behun > <marek.behun(a)nic.cz>,sr@denx.de,sjg@chromium.org, > patrick.delaunay@foss.st.com,xypron.glpk@gmx.de > Subject: Re: [PATCH v3 3/3] arm: mvebu: Initial ESPRESSOBin-Ultra > board support > Message-ID: > <CADZsf3buKpgUJq_2yP1zakQbf0Hoq_4oPLdi69_d+qoR+Hbn0w(a)mail.gmail.com> > Content-Type: text/plain; charset="UTF-8" > > Hello Pali, > > On Fri, Aug 13, 2021 at 11:27 AM Pali Roh?r<pali(a)kernel.org> wrote: >> On Friday 13 August 2021 01:39:38 Luka Kovacic wrote: >>> Add initial support for the ESPRESSOBin-Ultra board from Globalscale >>> Technologies, Inc. >>> >>> The board is based on the 64-bit dual-core Marvell Armada 3720 SoC. >>> Peripherals: >>> - 5 Gigabit Ethernet ports (WAN has PoE, up to 30W, Topaz 6341 switch) >>> - RTC clock (PCF8563) >>> - USB 3.0 port >>> - USB 2.0 port >>> - 4x LED >>> - UART over Micro-USB >>> - M.2 slot (2280) >>> - Mini PCI-E slot >>> >>> Additionally, automatic import of the Marvell hw_info parameters is >>> enabled via the recently added mac command for A37XX platforms. >>> The parameters stored in Marvell hw_info are usually the board serial >>> number and MAC addresses. >>> >>> Signed-off-by: Luka Kovacic<luka.kovacic(a)sartura.hr> >>> Cc: Luka Perkov<luka.perkov(a)sartura.hr> >>> Cc: Robert Marko<robert.marko(a)sartura.hr> >>> --- >>> arch/arm/dts/Makefile | 1 + >>> .../arm/dts/armada-3720-espressobin-ultra.dts | 114 ++++++++++ >>> arch/arm/dts/armada-3720-espressobin.dts | 199 +---------------- >>> arch/arm/dts/armada-3720-espressobin.dtsi | 210 ++++++++++++++++++ >>> board/Marvell/mvebu_armada-37xx/MAINTAINERS | 8 + >>> board/Marvell/mvebu_armada-37xx/board.c | 92 +++++++- >>> .../mvebu_espressobin-ultra-88f3720_defconfig | 93 ++++++++ >>> 7 files changed, 514 insertions(+), 203 deletions(-) >>> create mode 100644 arch/arm/dts/armada-3720-espressobin-ultra.dts >>> create mode 100644 arch/arm/dts/armada-3720-espressobin.dtsi >>> create mode 100644 configs/mvebu_espressobin-ultra-88f3720_defconfig >> ... Thanks, all, for this job. I am available for testing (if needed) on EspressoBin V7, with eMMC, and EspressoBin Ultra. I have issue on EspressoBin Ultra, with the v2 patch for EspressoBin-Ultra, on OpenWrt 21.02-RC, fw_printenv do not works... (CRC Error) I have the same issue with the Marvell (GlobalScale) u-Boot, factory and upgraded version. Environments variables are correctly managed from the u-Boot itself. Regards, Gérald Kerma PS : I am only registered to the digest, so I hope my mail will not be disturbing...

2 2

[PATCH v1] imx: spl: fix imx8m secure boot
by Heiko Schocher 16 Aug '21

16 Aug '21

inspired from NXP code: 719d665a87c6: ("MLK-20467 imx8m: Fix issue for booting signed image through uuu") fix loading FIT buffer address to fix position CONFIG_SYS_TEXT_BASE - CONFIG_FIT_EXTERNAL_OFFSET and fix secure boot on imx8m based boards. Problem was that FIT header and so IVT header too, was loaded to memallocated address. So the ivt header address coded in IVT itself does not fit with the real position. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- replaces Series: https://lists.denx.de/pipermail/u-boot/2021-August/457308.html @Tim: could you please test this version on your hardware? azure build: https://dev.azure.com/hs0298/hs/_build/results?buildId=71&view=results (fetch error for rockchip, but this should be no problem for this patch. How do I restart one specific job on azure?) Works on sdcard and QSPI NOR boot on phycore-imx8mp board. arch/arm/mach-imx/spl.c | 11 +++++++++++ common/spl/spl_fit.c | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 36033d611c..6991d88dbf 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -334,6 +334,17 @@ void board_spl_fit_post_load(const void *fit) } #endif +#if defined(CONFIG_FIT_EXTERNAL_OFFSET) +void *board_spl_fit_buffer_addr(ulong fit_size, int bl_len) +{ + /* + * use fix position + * TEXT_BASE - FIT_EXTERNAL_OFFSET + */ + return (void *)((CONFIG_SYS_TEXT_BASE - CONFIG_FIT_EXTERNAL_OFFSET)); +} +#endif + #endif #if defined(CONFIG_MX6) && defined(CONFIG_SPL_OS_BOOT) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index f41abca0cc..a4337d3c88 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -538,6 +538,11 @@ static void *spl_get_fit_load_buffer(size_t size) return buf; } +__weak void *board_spl_fit_buffer_addr(ulong fit_size, int sectors, int bl_len) +{ + return spl_get_fit_load_buffer(sectors * bl_len); +} + /* * Weak default function to allow customizing SPL fit loading for load-only * use cases by allowing to skip the parsing/processing of the FIT contents @@ -631,7 +636,7 @@ static int spl_simple_fit_read(struct spl_fit_info *ctx, * For FIT with external data, data is not loaded in this step. */ sectors = get_aligned_image_size(info, size, 0); - buf = spl_get_fit_load_buffer(sectors * info->bl_len); + buf = board_spl_fit_buffer_addr(size, sectors, info->bl_len); count = info->read(info, sector, sectors, buf); ctx->fit = buf; -- 2.31.1

2 2

[PATCH 1/2] serial: a37xx: Use CONFIG_BAUDRATE for initializing early debug UART
by Pali Rohár 16 Aug '21

16 Aug '21

CONFIG_BAUDRATE should be used for setting the baudrate for the early debug UART. This replaces current hardcoded 115200 value. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- drivers/serial/serial_mvebu_a3700.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index c7e66fef8768..52dc3fdad7b4 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -309,7 +309,7 @@ U_BOOT_DRIVER(serial_mvebu) = { static inline void _debug_uart_init(void) { void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE; - u32 baudrate, parent_rate, divider; + u32 parent_rate, divider; /* reset FIFOs */ writel(UART_CTRL_RXFIFO_RESET | UART_CTRL_TXFIFO_RESET, @@ -322,9 +322,8 @@ static inline void _debug_uart_init(void) * Calculate divider * baudrate = clock / 16 / divider */ - baudrate = 115200; parent_rate = get_ref_clk() * 1000000; - divider = DIV_ROUND_CLOSEST(parent_rate, baudrate * 16); + divider = DIV_ROUND_CLOSEST(parent_rate, CONFIG_BAUDRATE * 16); writel(divider, base + UART_BAUD_REG); /* -- 2.20.1

3 13

[PATCH] arm: kirkwood: Sheevaplug: Update board maintainer
by Tony Dinh 16 Aug '21

16 Aug '21

Change maintainer to me. Prafulla is no longer active in U-Boot community. Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- board/Marvell/sheevaplug/MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/Marvell/sheevaplug/MAINTAINERS b/board/Marvell/sheevaplug/MAINTAINERS index 2b0103d07d..282f046667 100644 --- a/board/Marvell/sheevaplug/MAINTAINERS +++ b/board/Marvell/sheevaplug/MAINTAINERS @@ -1,5 +1,5 @@ SHEEVAPLUG BOARD -M: Prafulla Wadaskar <prafulla(a)marvell.com> +M: Tony Dinh <mibodhi(a)gmail.com> S: Maintained F: board/Marvell/sheevaplug/ F: include/configs/sheevaplug.h -- 2.20.1

2 1

[PATCH 1/1] doc: move i.MX7D/i.MX8MM A/B booting to board specific
by Heinrich Schuchardt 16 Aug '21

16 Aug '21

Having "i.MX7D/i.MX8MM SRC_GPR10 PERSIST_SECONDARY_BOOT for bootloader A/B switching" at the top level of the documentation tree does not make sense. Move it to board specific information. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/board/freescale/index.rst | 1 + doc/{imx/misc => board/freescale}/psb.rst | 0 doc/imx/index.rst | 9 --------- doc/imx/misc/index.rst | 9 --------- doc/index.rst | 11 ----------- 5 files changed, 1 insertion(+), 29 deletions(-) rename doc/{imx/misc => board/freescale}/psb.rst (100%) delete mode 100644 doc/imx/index.rst delete mode 100644 doc/imx/misc/index.rst diff --git a/doc/board/freescale/index.rst b/doc/board/freescale/index.rst index bddc6c6c2c..aa192effab 100644 --- a/doc/board/freescale/index.rst +++ b/doc/board/freescale/index.rst @@ -17,3 +17,4 @@ Freescale mx6sabresd mx6ul_14x14_evk mx6ullevk + psb diff --git a/doc/imx/misc/psb.rst b/doc/board/freescale/psb.rst similarity index 100% rename from doc/imx/misc/psb.rst rename to doc/board/freescale/psb.rst diff --git a/doc/imx/index.rst b/doc/imx/index.rst deleted file mode 100644 index b225b1d183..0000000000 --- a/doc/imx/index.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0+ - -NXP i.MX Machine-specific doc -============================= - -.. toctree:: - :maxdepth: 2 - - misc/index diff --git a/doc/imx/misc/index.rst b/doc/imx/misc/index.rst deleted file mode 100644 index 85fbdb6588..0000000000 --- a/doc/imx/misc/index.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0+ - -Miscellaneous -============= - -.. toctree:: - :maxdepth: 2 - - psb diff --git a/doc/index.rst b/doc/index.rst index 8066fcbfc0..02de1d4684 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -64,17 +64,6 @@ implementation. arch/index -Machine-specific doc --------------------- - -These books provide programming details about machine-specific -implementation. - -.. toctree:: - :maxdepth: 2 - - imx/index - Board-specific doc ------------------ -- 2.30.2

2 1

[PATCH v1] imx: mkimage_fit_atf: replace @ with hyphen
by Oliver Graute 16 Aug '21

16 Aug '21

Unit addresses are not allowed anymore in a FIT image since commit 3f04db891a35 ("image: Check for unit addresses in FITs") This caused this error on mkimage creation: ./tools/mkimage: verify_header failed for FIT Image support with exit code 1 Makefile:1393: recipe for target 'u-boot.itb' failed make: *** [u-boot.itb] Error 1 replacing @ with hyphen solved the issue Signed-off-by: Oliver Graute <oliver.graute(a)kococonnector.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: uboot-imx <uboot-imx(a)nxp.com> --- arch/arm/mach-imx/mkimage_fit_atf.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh index fe12b7bb4b..c5fb9b0fc3 100755 --- a/arch/arm/mach-imx/mkimage_fit_atf.sh +++ b/arch/arm/mach-imx/mkimage_fit_atf.sh @@ -53,7 +53,7 @@ cat << __HEADER_EOF description = "Configuration to load ATF before U-Boot"; images { - uboot@1 { + uboot-1 { description = "U-Boot (64-bit)"; os = "u-boot"; data = /incbin/("$BL33"); @@ -68,7 +68,7 @@ cnt=1 for dtname in $* do cat << __FDT_IMAGE_EOF - fdt@$cnt { + fdt-$cnt { description = "$(basename $dtname .dtb)"; data = /incbin/("$dtname"); type = "flat_dt"; @@ -79,7 +79,7 @@ cnt=$((cnt+1)) done cat << __HEADER_EOF - atf@1 { + atf-1 { description = "ARM Trusted Firmware"; os = "arm-trusted-firmware"; data = /incbin/("$BL31"); @@ -93,7 +93,7 @@ __HEADER_EOF if [ -f $BL32 ]; then cat << __HEADER_EOF - tee@1 { + tee-1 { description = "TEE firmware"; data = /incbin/("$BL32"); type = "firmware"; @@ -108,7 +108,7 @@ fi cat << __CONF_HEADER_EOF }; configurations { - default = "config@1"; + default = "config-1"; __CONF_HEADER_EOF @@ -117,20 +117,20 @@ for dtname in $* do if [ -f $BL32 ]; then cat << __CONF_SECTION_EOF - config@$cnt { + config-$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1", "tee@1"; + firmware = "uboot-1"; + loadables = "atf-1", "tee-1"; fdt = "fdt@$cnt"; }; __CONF_SECTION_EOF else cat << __CONF_SECTION1_EOF - config@$cnt { + config-$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1"; - fdt = "fdt@$cnt"; + firmware = "uboot-1"; + loadables = "atf-1"; + fdt = "fdt-$cnt"; }; __CONF_SECTION1_EOF fi -- 2.17.1

6 10