diff mbox series

[1/5] boards: siemens: iot2050: Fix boot configuration

Message ID 6f0ce4b2ce4aac67a7a58c2d649b38ad86fb5ae7.1690432495.git.jan.kiszka@siemens.com
State Accepted
Commit 00e1c4549d50be685be9bf6ea9ce5e5d9de38447
Delegated to: Tom Rini
Headers show
Series iot2050: 2023.10-rc1 fixes and cleanups | expand

Commit Message

Jan Kiszka July 27, 2023, 4:34 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

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.

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 <jan.kiszka@siemens.com>

---
CC: Manorit Chawdhry <m-chawdhry@ti.com>
---
 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(+)

Comments

Tom Rini July 28, 2023, 4:50 p.m. UTC | #1 
On Thu, Jul 27, 2023 at 06:34:52AM +0200, Jan Kiszka wrote:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> 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.
> 
> 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 <jan.kiszka@siemens.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/board/siemens/iot2050/iot2050.env b/board/siemens/iot2050/iot2050.env
index 02958798b49..7fd836e6285 100644
--- a/board/siemens/iot2050/iot2050.env
+++ b/board/siemens/iot2050/iot2050.env
@@ -6,6 +6,8 @@ 
  *   Jan Kiszka <jan.kiszka@siemens.com>
  */
 
+#include <environment/ti/ti_armv7_common.env>
+
 usb_pgood_delay=900
 
 watchdog_timeout_ms=CONFIG_WATCHDOG_TIMEOUT_MSECS
diff --git a/configs/iot2050_pg1_defconfig b/configs/iot2050_pg1_defconfig
index cc1b9673d79..391ab78d366 100644
--- a/configs/iot2050_pg1_defconfig
+++ b/configs/iot2050_pg1_defconfig
@@ -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
diff --git a/configs/iot2050_pg2_defconfig b/configs/iot2050_pg2_defconfig
index c5741a4dae4..19c440732aa 100644
--- a/configs/iot2050_pg2_defconfig
+++ b/configs/iot2050_pg2_defconfig
@@ -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
diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h
index 2177e0dfe38..4968722d18f 100644
--- a/include/configs/iot2050.h
+++ b/include/configs/iot2050.h
@@ -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,"	\