iot2050: 2023.10-rc1 fixes and cleanups
cover iot2050: 2023.10-rc1 fixes and cleanups
[resent, now that the list is working again]
Most of this comes late, but primarily as the required binman templating changes were awaited, and the lots of regressions hit this board. I really hope we can not only merge the minimally required patch 1 of this series.
Jan
Jan Kiszka (5):
boards: siemens: iot2050: Fix boot configuration
iot2050: Use binman in signing script
boards: siemens: iot2050: Unify PG1 and PG2/M.2 configurations again
doc: board: siemens: iot2050: Update build env vars
configs: iot2050: Enabled keyed autoboot
arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 155 +++++++++++-------
board/siemens/iot2050/Kconfig | 30 +---
board/siemens/iot2050/MAINTAINERS | 3 +-
board/siemens/iot2050/board.c | 25 ++-
board/siemens/iot2050/iot2050.env | 2 +
...ot2050_pg1_defconfig => iot2050_defconfig} | 8 +-
configs/iot2050_pg2_defconfig | 150 -----------------
doc/board/siemens/iot2050.rst | 31 ++--
include/configs/iot2050.h | 11 ++
tools/iot2050-sign-fw.sh | 11 +-
10 files changed, 158 insertions(+), 268 deletions(-)
rename configs/{iot2050_pg1_defconfig => iot2050_defconfig} (94%)
delete mode 100644 configs/iot2050_pg2_defconfigSignature · 1 line
2.35.3
PATCH 1/5 boards: siemens: iot2050: Fix boot configuration
From: Jan Kiszka <[email protected]>
The common env bits now come via ti_armv7_common.env, include it. Futhermore restore the board-specific boot targets and their ordering that is now enforced k3-wide differently. Finally, enable CONFIG_LEGACY_IMAGE_FORMAT explicitly which got lost while turning FIT_SIGNATURE on by default for k3 devices.
---
CC: Manorit Chawdhry <[email protected]>
--- board/siemens/iot2050/iot2050.env | 2 ++ configs/iot2050_pg1_defconfig | 1 + configs/iot2050_pg2_defconfig | 1 + include/configs/iot2050.h | 11 +++++++++++ 4 files changed, 15 insertions(+)
board/siemens/iot2050/iot2050.env +2 -0
@@ -6,6 +6,8 @@ * Jan Kiszka <[email protected]> */ +#include <environment/ti/ti_armv7_common.env> + usb_pgood_delay=900 watchdog_timeout_ms=CONFIG_WATCHDOG_TIMEOUT_MSECS
configs/iot2050_pg1_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_SPL_SPI=y CONFIG_PCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_LOAD_FIT=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_DISTRO_DEFAULTS=y
configs/iot2050_pg2_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_SPL_SPI=y CONFIG_PCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_LOAD_FIT=y +CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_DISTRO_DEFAULTS=y
include/configs/iot2050.h +11 -0
@@ -15,6 +15,17 @@#include <configs/ti_armv7_common.h> +/* +* This defines all MMC devices, even if the basic variant has no mmc1. +* The non-supported device will be removed from the boot targets during +* runtime, when that board was detected. +*/ +#undef BOOT_TARGET_DEVICES +#define BOOT_TARGET_DEVICES (func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ + BOOT_TARGET_USB(func) +#ifdef CONFIG_ENV_WRITEABLE_LIST #define CFG_ENV_FLAGS_LIST_STATIC \ "board_uuid:sw,board_name:sw,board_serial:sw,board_a5e:sw," \
Signature · 1 line
2.35.3
Re: [PATCH 1/5] boards: siemens: iot2050: Fix boot configuration
Quoted 8 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
The common env bits now come via ti_armv7_common.env, include it. Futhermore restore the board-specific boot targets and their ordering that is now enforced k3-wide differently. Finally, enable
CONFIG_LEGACY_IMAGE_FORMATexplicitly which got lost while turningFIT_SIGNATUREon by default for k3 devices.
Quoted 4 lines
Fixes 53873974 ("include: armv7: Enable distroboot across all configs")Fixes 4ae1a247 ("env: Make common bootcmd across all k3 devices")Fixes 86fab110 ("Kconfig: Enable FIT_SIGNATURE if ARM64")Signed-off-by Jan Kiszka <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 2/5 iot2050: Use binman in signing script
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
The underlying issue was fixed in the meantime. Also signing the U-Boot proper fit image now works. Just supporting custom cert templates remains a todo.
---
CC: Simon Glass <[email protected]>
--- tools/iot2050-sign-fw.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
tools/iot2050-sign-fw.sh +2 -7
@@ -39,13 +39,8 @@ CERT_X509=$(mktemp XXXXXXXX.crt) openssl req -new -x509 -key $1 -nodes -outform DER -out $CERT_X509 -config $TEMP_X509 -sha512 cat $CERT_X509 tispl.bin > tispl.bin_signed -# currently broken in upstream -#source/tools/binman/binman replace -i flash.bin -f tispl.bin_signed blob@0x180000 -dd if=tispl.bin_signed of=flash.bin bs=$((0x1000)) seek=$((0x180000/0x1000)) conv=notrunc +source/tools/binman/binman replace -i flash.bin -f tispl.bin_signed fit@0x180000 rm $TEMP_X509 $CERT_X509 -tools/mkimage -G $1 -r -o sha256,rsa4096 -F [email protected] -# currently broken in upstream -#source/tools/binman/binman replace -i flash.bin -f [email protected] fit@0x380000 -dd [email protected] of=flash.bin bs=$((0x1000)) seek=$((0x380000/0x1000)) conv=notrunc +source/tools/binman/binman sign -i flash.bin -k $1 -a sha256,rsa4096 fit@0x380000
Signature · 1 line
2.35.3
Re: [PATCH 2/5] iot2050: Use binman in signing script
Quoted 7 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
The underlying issue was fixed in the meantime. Also signing the U-Boot proper fit image now works. Just supporting custom cert templates remains a todo.
Signed-off-by Jan Kiszka <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 3/5 boards: siemens: iot2050: Unify PG1 and PG2/M.2 configurations again
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This avoids having to maintain to defconfigs that are 99% equivalent. The approach is to use binman to generate two flash images, flash-pg1.bin and flash-pg2.bin. With the help of a template dtsi, we can avoid duplicating the common binman image definitions.
---
CC: Andrew Davis <[email protected]>
---
arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 155 +++++++++++-------
board/siemens/iot2050/Kconfig | 30 +---
board/siemens/iot2050/MAINTAINERS | 3 +-
board/siemens/iot2050/board.c | 25 ++-
...ot2050_pg1_defconfig => iot2050_defconfig} | 3 +-
configs/iot2050_pg2_defconfig | 151 -----------------
doc/board/siemens/iot2050.rst | 27 ++-
tools/iot2050-sign-fw.sh | 6 +-
8 files changed, 138 insertions(+), 262 deletions(-)
rename configs/{iot2050_pg1_defconfig => iot2050_defconfig} (97%)
delete mode 100644 configs/iot2050_pg2_defconfigarch/arm/dts/k3-am65-iot2050-boot-image.dtsi +97 -58
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (c) Siemens AG, 2020-2022 + * Copyright (c) Siemens AG, 2020-2023 * * Authors: * Jan Kiszka <[email protected]>
@@ -10,23 +10,23 @@ #include <config.h> / { - binman { - filename = "flash.bin"; + binman: binman { + multiple-images; + }; +}; + +&binman { + common_part: template { pad-byte = <0xff>; size = <0x8c0000>; allow-repack; - blob-ext@0x000000 { + blob-ext@0 { offset = <0x000000>; -#ifdef CONFIG_TARGET_IOT2050_A53_PG1 - filename = "seboot_pg1.bin"; -#else - filename = "seboot_pg2.bin"; -#endif missing-msg = "iot2050-seboot"; }; - fit@0x180000 { + fit@180000 { offset = <0x180000>; filename = "tispl.bin"; pad-byte = <0xff>;
@@ -104,9 +104,8 @@ }; }; - fit@0x380000 { + fit@380000 { description = "U-Boot for IOT2050"; - fit,fdt-list = "of-list"; offset = <0x380000>; images { u-boot {
@@ -134,36 +133,6 @@ }; }; -#ifdef CONFIG_TARGET_IOT2050_A53_PG2 - bkey-usb3-overlay { - description = "M.2-bkey-usb3-overlay"; - type = "blob"; - load = <0x82100000>; - arch = "arm64"; - compression = "none"; - blob-ext { - filename = "k3-am6548-iot2050-advanced-m2-bkey-usb3-overlay.dtbo"; - }; - hash { - algo = "sha256"; - }; - }; - - bkey-ekey-pcie-overlay { - description = "M.2-bkey-ekey-pcie-overlay"; - type = "blob"; - load = <0x82110000>; - arch = "arm64"; - compression = "none"; - blob-ext { - filename = "k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie-overlay.dtbo"; - }; - hash { - algo = "sha256"; - }; - }; -#endif - #ifdef CONFIG_WDT_K3_RTI_FW_FILE k3-rti-wdt-firmware { type = "firmware";
@@ -182,20 +151,10 @@ }; configurations { - default = "@config-DEFAULT-SEQ"; @config-SEQ { description = "NAME"; firmware = "u-boot"; fdt = "fdt-SEQ"; - loadables = -#ifdef CONFIG_TARGET_IOT2050_A53_PG2 - "bkey-usb3-overlay", - "bkey-ekey-pcie-overlay", -#endif -#ifdef CONFIG_WDT_K3_RTI_FW_FILE - "k3-rti-wdt-firmware", -#endif - <>; signature { sign-images = "firmware", "fdt", "loadables"; };
@@ -207,32 +166,112 @@ }; /* primary env */ - fill@0x680000 { + fill@680000 { offset = <0x680000>; size = <0x020000>; fill-byte = [00]; }; /* secondary env */ - fill@0x6a0000 { + fill@6a0000 { offset = <0x6a0000>; size = <0x020000>; fill-byte = [00]; }; - /* OTP update command block */ -#if CONFIG_IOT2050_EMBED_OTPCMD - blob-ext@0x6c0000 { +/* OTP update command block */ +#ifdef CONFIG_IOT2050_EMBED_OTPCMD + blob-ext@6c0000 { offset = <0x6c0000>; + size = <0x010000>; filename = "otpcmd.bin"; missing-msg = "iot2050-otpcmd"; }; #else - fill@0x6c0000 { + fill@6c0000 { offset = <0x6c0000>; size = <0x010000>; fill-byte = [ff]; }; #endif }; + + flash-pg1 { + filename = "flash-pg1.bin"; + insert-template = <&common_part>; + + blob-ext@0 { + filename = "seboot_pg1.bin"; + }; + + fit@380000 { + fit,fdt-list-val = "k3-am6528-iot2050-basic", "k3-am6548-iot2050-advanced"; + + configurations { + default = "k3-am6528-iot2050-basic"; + @config-SEQ { + loadables = +#ifdef CONFIG_WDT_K3_RTI_FW_FILE + "k3-rti-wdt-firmware", +#endif + <>; + }; + }; + }; + }; + + flash-pg2 { + filename = "flash-pg2.bin"; + insert-template = <&common_part>; + + blob-ext@0 { + filename = "seboot_pg2.bin"; + }; + + fit@380000 { + fit,fdt-list-val = "k3-am6528-iot2050-basic-pg2", "k3-am6548-iot2050-advanced-pg2", "k3-am6548-iot2050-advanced-m2"; + + images { + bkey-usb3-overlay { + description = "M.2-bkey-usb3-overlay"; + type = "blob"; + load = <0x82100000>; + arch = "arm64"; + compression = "none"; + blob-ext { + filename = "k3-am6548-iot2050-advanced-m2-bkey-usb3-overlay.dtbo"; + }; + hash { + algo = "sha256"; + }; + }; + + bkey-ekey-pcie-overlay { + description = "M.2-bkey-ekey-pcie-overlay"; + type = "blob"; + load = <0x82110000>; + arch = "arm64"; + compression = "none"; + blob-ext { + filename = "k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie-overlay.dtbo"; + }; + hash { + algo = "sha256"; + }; + }; + }; + + configurations { + default = "k3-am6528-iot2050-basic-pg2"; + @config-SEQ { + loadables = +#ifdef CONFIG_WDT_K3_RTI_FW_FILE + "k3-rti-wdt-firmware", +#endif + "bkey-usb3-overlay", + "bkey-ekey-pcie-overlay"; + }; + }; + }; + }; };
board/siemens/iot2050/Kconfig +6 -24
@@ -1,40 +1,22 @@ # SPDX-License-Identifier: GPL-2.0+ # -# Copyright (c) Siemens AG, 2018-2022 +# Copyright (c) Siemens AG, 2018-2023 # # Authors: # Le Jin <[email protected]> # Jan Kiszka <[email protected]> -choice - prompt "Siemens SIMATIC IOT2050 boards" - optional - -config TARGET_IOT2050_A53_PG1 - bool "IOT2050 PG1 running on A53" - select IOT2050_A53_COMMON - help - This builds U-Boot for the Product Generation 1 (PG1) of the IOT2050 - devices. - -config TARGET_IOT2050_A53_PG2 - bool "IOT2050 PG2 running on A53" - select IOT2050_A53_COMMON - help - This builds U-Boot for the Product Generation 2 (PG2) of the IOT2050 - devices. - -endchoice - -config IOT2050_A53_COMMON - bool +config TARGET_IOT2050_A53 + bool "IOT2050 running on A53" select ARM64 select SOC_K3_AM654 select BOARD_LATE_INIT select SYS_DISABLE_DCACHE_OPS select BINMAN + help + This builds U-Boot for the IOT2050 devices. -if IOT2050_A53_COMMON +if TARGET_IOT2050_A53 config SYS_BOARD default "iot2050"
board/siemens/iot2050/MAINTAINERS +1 -2
@@ -4,7 +4,6 @@ M: Jan Kiszka <[email protected]> S: Maintained F: board/siemens/iot2050/ F: include/configs/iot2050.h -F: configs/iot2050_pg1_defconfig -F: configs/iot2050_pg2_defconfig +F: configs/iot2050_defconfig F: arch/arm/dts/iot2050-* F: doc/board/siemens/iot2050.rst
board/siemens/iot2050/board.c +16 -9
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Board specific initialization for IOT2050 -* Copyright (c) Siemens AG, 2018-2022 +* Copyright (c) Siemens AG, 2018-2023 * * Authors: * Le Jin <[email protected]>
@@ -147,21 +147,28 @@ static void set_pinvalue(const char *gpio_name, const char *label, int value)dm_gpio_set_value (&gpio, value); } -static bool board_is_m2 (void ) +static bool board_is_advanced (void ) {struct iot2050_info *info =IOT2050_INFO_DATA ; -return IS_ENABLED (CONFIG_TARGET_IOT2050_A53_PG2 ) && - info->magic ==IOT2050_INFO_MAGIC && -strcmp ((char *)info->name,"IOT2050-ADVANCED-M2" ) ==0 ; +return info->magic ==IOT2050_INFO_MAGIC && +strstr ((char *)info->name,"IOT2050-ADVANCED" ) !=NULL ; } -static bool board_is_advanced (void ) +static bool board_is_sr1 (void ) {struct iot2050_info *info =IOT2050_INFO_DATA ;return info->magic ==IOT2050_INFO_MAGIC && -strstr ((char *)info->name,"IOT2050-ADVANCED" ) !=NULL ; +strstr ((char *)info->name,"-PG2" ) !=NULL ; +} + +static bool board_is_m2 (void ) +{ +struct iot2050_info *info =IOT2050_INFO_DATA ; + +return !board_is_sr1 () && info->magic ==IOT2050_INFO_MAGIC && +strcmp ((char *)info->name,"IOT2050-ADVANCED-M2" ) ==0 ; }static void remove_mmc1_target (void )
@@ -210,14 +217,14 @@ void set_board_info_env(void) }if (board_is_advanced ()) { -if (IS_ENABLED (CONFIG_TARGET_IOT2050_A53_PG1 )) +if (board_is_sr1 ()) fdtfile ="ti/k3-am6548-iot2050-advanced.dtb" ;else if (board_is_m2 ()) fdtfile ="ti/k3-am6548-iot2050-advanced-m2.dtb" ;else fdtfile ="ti/k3-am6548-iot2050-advanced-pg2.dtb" ; }else { -if (IS_ENABLED (CONFIG_TARGET_IOT2050_A53_PG1 )) +if (board_is_sr1 ()) fdtfile ="ti/k3-am6528-iot2050-basic.dtb" ;else fdtfile ="ti/k3-am6528-iot2050-basic-pg2.dtb" ;
configs/iot2050_defconfig renamed from configs/iot2050_pg1_defconfig +1 -2
@@ -8,7 +8,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM654=y -CONFIG_TARGET_IOT2050_A53_PG1=y +CONFIG_TARGET_IOT2050_A53=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80100000 CONFIG_ENV_SIZE=0x20000
@@ -74,7 +74,6 @@ CONFIG_CMD_TIME=y # CONFIG_ISO_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="k3-am6528-iot2050-basic k3-am6548-iot2050-advanced" CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_SPL_OF_LIST="k3-am65-iot2050-spl" CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
configs/iot2050_pg2_defconfig deleted +0 -151
151 lines not on this page · raw message
doc/board/siemens/iot2050.rst +13 -14
@@ -68,15 +68,14 @@ U-Boot: $ export ATF=/path/to/bl31.bin $ export TEE=/path/to/tee-pager_v2.bin - - # configure for PG1 - $ make iot2050_pg1_defconfig - - # or configure for PG2 or the M.2 variant - $ make iot2050_pg2_defconfig + $ make iot2050_defconfig $ make +This will generate two different flash images: flash-p1.bin that targets the +first generation of IOT2050 devices and flash-pg2.bin that runs on PG2 +including M.2 devices. + Flashing --------
@@ -85,20 +84,20 @@ Via U-Boot: .. code-block:: text IOT2050> sf probe - IOT2050> load mmc 0:1 $loadaddr /path/to/flash.bin + IOT2050> load mmc 0:1 $loadaddr /path/to/flash-pgX.bin IOT2050> sf update $loadaddr 0x0 $filesize Via external programmer Dediprog SF100 or SF600: .. code-block:: text - $ dpcmd --vcc 2 -v -u flash.bin + $ dpcmd --vcc 2 -v -u flash-pgX.bin Signing (optional) ------------------ To enable verified boot for the firmware artifacts after the Siemens-managed -first-stage loader (seboot_pg*.bin), the following steps need to be taken +first-stage loader (seboot_pgX.bin), the following steps need to be taken before and after the build: Generate dtsi holding the public key
@@ -131,8 +130,8 @@ Build U-Boot See related section above. -Sign flash.bin -^^^^^^^^^^^^^^ +Sign flash-pgX.bin +^^^^^^^^^^^^^^^^^^ In the build folder still containing artifacts from step 3, invoke:
@@ -140,10 +139,10 @@ In the build folder still containing artifacts from step 3, invoke: tools/iot2050-sign-fw.sh /path/to/key.pem -Flash signed flash.bin -^^^^^^^^^^^^^^^^^^^^^^ +Flash signed flash-pgX.bin +^^^^^^^^^^^^^^^^^^^^^^^^^^ -The signing has happen in-place in flash.bin, thus the flashing procedure +The signing has happen in-place in flash-pgX.bin, thus the flashing procedure described above. M.2 slot configuration
tools/iot2050-sign-fw.sh +4 -2
@@ -39,8 +39,10 @@ CERT_X509=$(mktemp XXXXXXXX.crt) openssl req -new -x509 -key $1 -nodes -outform DER -out $CERT_X509 -config $TEMP_X509 -sha512 cat $CERT_X509 tispl.bin > tispl.bin_signed -source/tools/binman/binman replace -i flash.bin -f tispl.bin_signed fit@0x180000 +source/tools/binman/binman replace -i flash-pg1.bin -f tispl.bin_signed fit@180000 +source/tools/binman/binman replace -i flash-pg2.bin -f tispl.bin_signed fit@180000 rm $TEMP_X509 $CERT_X509 -source/tools/binman/binman sign -i flash.bin -k $1 -a sha256,rsa4096 fit@0x380000 +source/tools/binman/binman sign -i flash-pg1.bin -k $1 -a sha256,rsa4096 fit@380000 +source/tools/binman/binman sign -i flash-pg2.bin -k $1 -a sha256,rsa4096 fit@380000
Signature · 1 line
2.35.3
Re: [PATCH 3/5] boards: siemens: iot2050: Unify PG1 and PG2/M.2 configurations again
Quoted 13 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
This avoids having to maintain to defconfigs that are 99% equivalent. The approach is to use binman to generate two flash images, flash-pg1.bin and flash-pg2.bin. With the help of a template dtsi, we can avoid duplicating the common binman image definitions.
Suggested-by Andrew Davis <[email protected]>Signed-off-by Jan Kiszka <[email protected]>---
CC: Andrew Davis <[email protected]>
Quoted 12 lines
---
arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 155 +++++++++++-------
board/siemens/iot2050/Kconfig | 30 +---
board/siemens/iot2050/MAINTAINERS | 3 +-
board/siemens/iot2050/board.c | 25 ++-
...ot2050_pg1_defconfig => iot2050_defconfig} | 3 +-
configs/iot2050_pg2_defconfig | 151 -----------------
doc/board/siemens/iot2050.rst | 27 ++-
tools/iot2050-sign-fw.sh | 6 +-
8 files changed, 138 insertions(+), 262 deletions(-)
rename configs/{iot2050_pg1_defconfig => iot2050_defconfig} (97%)
delete mode 100644 configs/iot2050_pg2_defconfigRe: [PATCH 3/5] boards: siemens: iot2050: Unify PG1 and PG2/M.2 configurations again
In reply to Jan KiszkaQuoted 9 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
This avoids having to maintain to defconfigs that are 99% equivalent. The approach is to use binman to generate two flash images, flash-pg1.bin and flash-pg2.bin. With the help of a template dtsi, we can avoid duplicating the common binman image definitions.
Suggested-by Andrew Davis <[email protected]>Signed-off-by Jan Kiszka <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 4/5 doc: board: siemens: iot2050: Update build env vars
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
ATF is now called BL31, and OP-TEE since 3.21 suggests to use tee-raw.bin instead of (the still identical) tee-pager_v2.bin.
--- doc/board/siemens/iot2050.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
doc/board/siemens/iot2050.rst +2 -2
@@ -66,8 +66,8 @@ U-Boot: .. code-block:: text - $ export ATF=/path/to/bl31.bin - $ export TEE=/path/to/tee-pager_v2.bin + $ export BL31=/path/to/bl31.bin + $ export TEE=/path/to/tee-raw.bin $ make iot2050_defconfig $ make
Signature · 1 line
2.35.3
Re: [PATCH 4/5] doc: board: siemens: iot2050: Update build env vars
Quoted 6 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
ATF is now called BL31, and OP-TEE since 3.21 suggests to use tee-raw.bin instead of (the still identical) tee-pager_v2.bin.
Signed-off-by Jan Kiszka <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 5/5 configs: iot2050: Enabled keyed autoboot
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Only accept SPACE to stop autobooting. This is safer to avoid accidental interruptions on unattended devices.
--- configs/iot2050_defconfig | 4 ++++ 1 file changed, 4 insertions(+)
configs/iot2050_defconfig +4 -0
@@ -36,6 +36,10 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTSTAGE=y CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_SPL_SHOW_BOOT_PROGRESS=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_FLUSH_STDIN=y +CONFIG_AUTOBOOT_PROMPT="Hit SPACE to stop autoboot in %d seconds...\n" +CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_BOOTCOMMAND="run start_watchdog; run distro_bootcmd" CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_CPUINFO is not set
Signature · 1 line
2.35.3
Re: [PATCH 5/5] configs: iot2050: Enabled keyed autoboot
Quoted 6 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Only accept SPACE to stop autobooting. This is safer to avoid accidental interruptions on unattended devices.
Signed-off-by Jan Kiszka <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom