Switch to cip_merged_defconfig, clean up ti-am62px-sk recipes
cover Switch to cip_merged_defconfig, clean up ti-am62px-sk recipes
This first of all switches all boards to the cip_merged_defconfig. There is a slight risk to regress as not all boards could have been tested so far. Please support this!
Test status:
- qemus - ok
- bbb - ok
- iwg20m - does not boot from isar-cip-core, even before the change
- hihope-rzg2m - boots but takes longer [1]
- ti-am62px-dk - untested
The series closes with two clean-up patches for the ti-am62px-sk. Both are build-tested only.
Jan
[1] https://lore.kernel.org/cip-dev/[email protected]/
Jan Kiszka (6):
linux-cip: Add lz4 as build dependency when using cip-kernel-config
arm: Switch to cip_merged_defconfig
arm64: Switch to cip_merged_defconfig
linux-cip: Refactor KERNEL_DEFCONFIG initialization
u-boot-ti-am62px-sk: Drop redundant or unused DEBIAN_BUILD_DEPENDS
ti-am62px-sk: Switch wks files to gpt-hybrid
conf/machine/bbb.conf | 3 +-- conf/machine/hihope-rzg2m.conf | 3 +-- conf/machine/iwg20m.conf | 1 - conf/machine/qemu-amd64.conf | 1 - conf/machine/qemu-arm.conf | 3 +-- conf/machine/qemu-arm64.conf | 1 - conf/machine/qemu-riscv64.conf | 2 -- conf/machine/ti-am62px-sk.conf | 1 - conf/machine/x86-uefi.conf | 1 - recipes-bsp/u-boot/u-boot-ti-am62px-sk_2025.07.bb | 1 - recipes-kernel/linux/cip-kernel-config.inc | 12 ++++++++++-- recipes-kernel/linux/linux-cip-common.inc | 3 --- wic/ti-am62px-sk-efibootguard-secureboot.wks.in | 4 ++-- wic/ti-am62px-sk-efibootguard.wks.in | 4 ++-- wic/ti-am62px-sk.wks | 4 ++-- 15 files changed, 19 insertions(+), 25 deletions(-)
Signature · 1 line
2.51.0
PATCH 1/6 linux-cip: Add lz4 as build dependency when using cip-kernel-config
From: Jan Kiszka <[email protected]>
The merged defconfig for arm needs this.
--- recipes-kernel/linux/cip-kernel-config.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/cip-kernel-config.inc +1 -1
@@ -19,4 +19,4 @@ SRCREV_cip-kernel-config ?= "ba0204aa6c1c5a41dcb4fa1087b5ef5dd3ebf81f" do_fetch[vardeps] += "SRCREV_cip-kernel-config" -KBUILD_DEPENDS:append = "${@', lzop' if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else ''}" +KBUILD_DEPENDS:append = "${@', lzop, lz4' if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else ''}"
Signature · 1 line
2.51.0
PATCH 2/6 arm: Switch to cip_merged_defconfig
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets. Tested on qemu and bbb.
--- conf/machine/bbb.conf | 4 ++-- conf/machine/iwg20m.conf | 2 +- conf/machine/qemu-arm.conf | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
conf/machine/bbb.conf +2 -2
@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # SPDX-License-Identifier: MIT #
@@ -14,7 +14,7 @@ IMAGER_INSTALL:wic += "u-boot-bbb ${SYSTEMD_BOOTLOADER_INSTALL}" IMAGER_BUILD_DEPS += "u-boot-bbb" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_bbb_defconfig" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" # for SWUpdate setups: watchdog is configured in U-Boot WDOG_TIMEOUT = "0"
conf/machine/iwg20m.conf +1 -1
@@ -16,7 +16,7 @@ BAUDRATE_TTY = "115200" # Setting for kernel and boot USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/renesas_shmobile_defconfig" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" DTB_FILES = "r8a7743-iwg20d-q7-dbcm-ca.dtb" KERNEL_IMAGE="zImage" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
conf/machine/qemu-arm.conf +2 -2
@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # Copyright (c) TOSHIBA CORPORATION, 2021 # # SPDX-License-Identifier: MIT
@@ -11,7 +11,7 @@ DISTRO_ARCH = "armhf" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" +KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" # watchdog is not yet supported in our QEMU executor for this platform, disable it WDOG_TIMEOUT = "0"
Signature · 1 line
2.51.0
PATCH 3/6 arm64: Switch to cip_merged_defconfig
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
--- conf/machine/hihope-rzg2m.conf | 4 ++-- conf/machine/ti-am62px-sk.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
conf/machine/hihope-rzg2m.conf +2 -2
@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>
@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64" IMAGE_FSTYPES ?= "wic" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig" USE_CIP_KERNEL_CONFIG = "1" DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
conf/machine/ti-am62px-sk.conf +1 -1
@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \ /usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-evm.bin;tiboot3.bin" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/ti_defconfig" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig" WDOG_TIMEOUT = "0"
Signature · 1 line
2.51.0
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 37 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>--- conf/machine/hihope-rzg2m.conf | 4 ++-- conf/machine/ti-am62px-sk.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope-rzg2m.conf +2
-2@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64" IMAGE_FSTYPES ?= "wic" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig" USE_CIP_KERNEL_CONFIG = "1" DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti-am62px-sk.conf +0
-0
conf/machine/ti-am62px-sk.conf IMAGE_BOOT_FILES = " \ · line 26
Quoted 5 lines
conf/machine/ti-am62px-sk.conf +1
-1@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \ /usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-evm.bin;tiboot3.bin" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/ti_defconfig" +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig"
Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports pcr_hash 'sha256' or 'ecc' - cannot create a encrypted device!
But the tpm2 device is available and the tpm2 getcap algorithms command confirms that the device supports sha256 and ecc.
It's working with ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead of module.
I'll run some more tests to properly identify the issue and post a fix in here or cip-kernel-config repo.
Quoted 2 lines
conf/machine/ti-am62px-sk.conf +0
-0WDOG_TIMEOUT = "0"
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 56 lines · Sai Sree Kartheek Adivi
Quoted 39 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>---
conf/machine/hihope-rzg2m.conf| 4 ++--
conf/machine/ti-am62px-sk.conf| 2 +-2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope- renamed from conf/machine/hihope-rzg2m.conf +0
-0rzg2m.conf
index0b3acf49..485683b2100644conf/machine/hihope-rzg2m.conf +1
-1@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64"
IMAGE_FSTYPES?= "wic"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/renesas_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"
USE_CIP_KERNEL_CONFIG= "1"
DTB_FILES= "r8a774a1-hihope-rzg2m-ex.dtb"IMAGE_BOOT_FILES= "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti-am62px- renamed from conf/machine/ti-am62px-sk.conf +0
-0sk.conf
index589f071e..bf3cf9ab100644conf/machine/ti-am62px-sk.conf +0
-0@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \Quoted 7 lines
/usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-evm.bin;tiboot3.bin"
USE_CIP_KERNEL_CONFIG= "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/ti_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports
pcr_hash'sha256' or 'ecc' - cannot create a encrypted device!
Quoted 6 lines
But the tpm2 device is available and the
tpm2 getcap algorithmscommand confirms that the device supports sha256 and ecc.It's working with
ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead of module.
And there is no other module missing in the initramfs that might be built-in with your config? If you re-run the encryption hook manually from the initramfs later, that will work then?
Quoted 6 lines
I'll run some more tests to properly identify the issue and post a fix in here or cip-kernel-config repo.
Quoted 1 line
WDOG_TIMEOUT= "0"
Thanks for reporting. Finding the root cause will be important to avoid that other users will run into similar issues later on.
Jan
Signature · 2 lines
Siemens AG, Foundational Technologies Linux Expert Center
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 60 lines · Jan Kiszka
Quoted 59 lines · Sai Sree Kartheek Adivi
Quoted 40 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>--- conf/machine/hihope-rzg2m.conf | 4 ++-- conf/machine/ti-am62px-sk.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope- renamed from conf/machine/hihope-rzg2m.conf +0
-0rzg2m.conf
index0b3acf49..485683b2100644conf/machine/hihope-rzg2m.conf +1
-1@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64" IMAGE_FSTYPES ?= "wic" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"
USE_CIP_KERNEL_CONFIG= "1"
DTB_FILES= "r8a774a1-hihope-rzg2m-ex.dtb"IMAGE_BOOT_FILES= "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti-am62px- renamed from conf/machine/ti-am62px-sk.conf +0
-0sk.conf
index589f071e..bf3cf9ab100644conf/machine/ti-am62px-sk.conf +0
-0@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \ /usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-Quoted 6 lines
evm.bin;tiboot3.bin"
USE_CIP_KERNEL_CONFIG= "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/ti_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports
pcr_hash'sha256' or 'ecc' - cannot create a encrypted device!But the tpm2 device is available and the
tpm2 getcap algorithmscommand confirms that the device supports sha256 and ecc.
Quoted 7 lines
Quoted 3 lines
It's working with
ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead of module.And there is no other module missing in the initramfs that might be built-in with your config? If you re-run the encryption hook manually from the initramfs later, that will work then?
yes. Once after the boot stops at initramfs with above error, running /scripts/local-top/crypt manually starts encryption without any issues.
Quoted 10 lines
Quoted 7 lines
I'll run some more tests to properly identify the issue and post a fix in here or cip-kernel-config repo.
Quoted 1 line
WDOG_TIMEOUT= "0"Thanks for reporting. Finding the root cause will be important to avoid that other users will run into similar issues later on.
Yup, actively working on it.
Quoted 3 lines
Jan
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 79 lines · Sai Sree Kartheek Adivi
Quoted 60 lines · Jan Kiszka
Quoted 59 lines · Sai Sree Kartheek Adivi
Quoted 39 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>---
conf/machine/hihope-rzg2m.conf| 4 ++--
conf/machine/ti-am62px-sk.conf| 2 +-2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope- renamed from conf/machine/hihope-rzg2m.conf +0
-0rzg2m.conf
index0b3acf49..485683b2100644conf/machine/hihope-rzg2m.conf +1
-1@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64"
IMAGE_FSTYPES?= "wic"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/renesas_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"
USE_CIP_KERNEL_CONFIG= "1"
DTB_FILES= "r8a774a1-hihope-rzg2m-ex.dtb"IMAGE_BOOT_FILES= "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti-am62px- renamed from conf/machine/ti-am62px-sk.conf +0
-0sk.conf
index589f071e..bf3cf9ab100644conf/machine/ti-am62px-sk.conf +0
-0@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \Quoted 7 lines
/usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-evm.bin;tiboot3.bin"
USE_CIP_KERNEL_CONFIG= "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/ti_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports
pcr_hash'sha256' or 'ecc' - cannot create a encrypted device!But the tpm2 device is available and the
tpm2 getcap algorithmscommand confirms that the device supports sha256 and ecc.Quoted 7 lines
Quoted 3 lines
It's working with
ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead of module.And there is no other module missing in the initramfs that might be built-in with your config? If you re-run the encryption hook manually from the initramfs later, that will work then?
yes. Once after the boot stops at initramfs with above error, running
/scripts/local-top/cryptmanually starts encryption without any issues.Quoted 5 lines
Quoted 5 lines
I'll run some more tests to properly identify the issue and post a fix in here or cip-kernel-config repo.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Quoted 1 line
WDOG_TIMEOUT= "0"Thanks for reporting. Finding the root cause will be important to avoid that other users will run into similar issues later on.
Yup, actively working on it.
Is initramfs-tee-ftpm-hook included in the build? That is supposed to wait for the ftpm to appear.
Jan
Signature · 2 lines
Siemens AG, Foundational Technologies Linux Expert Center
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 83 lines · Jan Kiszka
Quoted 82 lines · Sai Sree Kartheek Adivi
Quoted 60 lines · Jan Kiszka
Quoted 59 lines · Sai Sree Kartheek Adivi
Quoted 40 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>--- conf/machine/hihope-rzg2m.conf | 4 ++-- conf/machine/ti-am62px-sk.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope- renamed from conf/machine/hihope-rzg2m.conf +0
-0rzg2m.conf
index0b3acf49..485683b2100644conf/machine/hihope-rzg2m.conf +1
-1@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64" IMAGE_FSTYPES ?= "wic" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"
USE_CIP_KERNEL_CONFIG= "1"
DTB_FILES= "r8a774a1-hihope-rzg2m-ex.dtb"IMAGE_BOOT_FILES= "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti-am62px- renamed from conf/machine/ti-am62px-sk.conf +0
-0sk.conf
index589f071e..bf3cf9ab100644conf/machine/ti-am62px-sk.conf +0
-0@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \ /usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-Quoted 6 lines
evm.bin;tiboot3.bin"
USE_CIP_KERNEL_CONFIG= "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/ti_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports
pcr_hash'sha256' or 'ecc' - cannot create a encrypted device!But the tpm2 device is available and the
tpm2 getcap algorithmscommand confirms that the device supports sha256 and ecc.Quoted 7 lines
Quoted 3 lines
It's working with
ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead of module.And there is no other module missing in the initramfs that might be built-in with your config? If you re-run the encryption hook manually from the initramfs later, that will work then?
yes. Once after the boot stops at initramfs with above error, running
/scripts/local-top/cryptmanually starts encryption without any issues.Quoted 8 lines
Quoted 7 lines
I'll run some more tests to properly identify the issue and post a fix in here or cip-kernel-config repo.
Quoted 1 line
WDOG_TIMEOUT= "0"
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Thanks for reporting. Finding the root cause will be important to avoid that other users will run into similar issues later on.
Yup, actively working on it.
Is initramfs-tee-ftpm-hook included in the build? That is supposed to wait for the ftpm to appear.
Just found out that it's not included in the build. The recipe itself is built but the local-top is not added to the SRC_URI.
There are 2 issues.
1. TEE_SUPPLICANT_IN_USERLAND is not set.
2. the initramfs-tee-ftpm-hook recipe has an issue. There is a missing : while adding supp-user to the OVERRIDES.
I'll send a patch fixing [1] in sometime. I've sent a PATCH on isar-users for [2] but I don't see it on the list. Will try to repost in sometime if I still don't find it.
Kartheek
Quoted 3 lines
Jan
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 101 lines · Sai Sree Kartheek Adivi
Quoted 86 lines · Jan Kiszka
Quoted 85 lines · Sai Sree Kartheek Adivi
Quoted 61 lines · Jan Kiszka
Quoted 60 lines · Sai Sree Kartheek Adivi
Quoted 40 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>---
conf/machine/hihope-rzg2m.conf| 4 ++--
conf/machine/ti-am62px-sk.conf| 2 +-2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope- renamed from conf/machine/hihope-rzg2m.conf +0
-0rzg2m.conf
index0b3acf49..485683b2100644conf/machine/hihope-rzg2m.conf +1
-1@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64"
IMAGE_FSTYPES?= "wic"
-KERNEL_DEFCONFIG = "cip-kernel-config/ ${KERNEL_DEFCONFIG_VERSION}/
arm64/renesas_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"
USE_CIP_KERNEL_CONFIG= "1"
DTB_FILES= "r8a774a1-hihope-rzg2m-ex.dtb"IMAGE_BOOT_FILES= "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti-am62px- renamed from conf/machine/ti-am62px-sk.conf +0
-0sk.conf
index589f071e..bf3cf9ab100644conf/machine/ti-am62px-sk.conf +0
-0@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \Quoted 7 lines
/usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-evm.bin;tiboot3.bin"
USE_CIP_KERNEL_CONFIG= "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/ti_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports
pcr_hash'sha256' or 'ecc' - cannot create a encrypted device!But the tpm2 device is available and the
tpm2 getcap algorithmscommand confirms that the device supports sha256 and ecc.Quoted 8 lines
Quoted 4 lines
It's working with
ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead
of module.And there is no other module missing in the initramfs that might be built-in with your config? If you re-run the encryption hook manually from the initramfs later, that will work then?
yes. Once after the boot stops at initramfs with above error, running
/scripts/local-top/cryptmanually starts encryption without any issues.Quoted 8 lines
Quoted 7 lines
I'll run some more tests to properly identify the issue and post a fix in here or cip-kernel-config repo.
Quoted 1 line
WDOG_TIMEOUT= "0"Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Thanks for reporting. Finding the root cause will be important to avoid that other users will run into similar issues later on.
Yup, actively working on it.
Is initramfs-tee-ftpm-hook included in the build? That is supposed to wait for the ftpm to appear.
Just found out that it's not included in the build. The recipe itself is built but the local-top is not added to the
SRC_URI.
Quoted 8 lines
There are 2 issues.
1.TEE_SUPPLICANT_IN_USERLANDis not set.
2. the initramfs-tee-ftpm-hook recipe has an issue. There is a missing :
while adding supp-user to the OVERRIDES.I'll send a patch fixing [1] in sometime. I've sent a PATCH on isar- users for [2] but I don't see it on the list. Will try to repost in sometime if I still don't find it.
I had a look at the config diff again but still didn't spot anything that could explain the different behavior. Fact is that the userland supplicant should no longer be used - pulling it in is likely only papering over the underlying synchronization issue we may still have.
Did you also try with just the initramfs-tee-ftpm-hook of isar fixed while keeping TEE_SUPPLICANT_IN_USERLAND = "0"? If that still causes issues on your board, maybe you could add "set -x" to isar/meta/recipes-initramfs/initramfs-tee-ftpm-hook/files/local-top and also to recipes-initramfs/initramfs-crypt-hook/files/local-top-complete and share a boot log. I hope that this will tell us more about what is going on.
Jan
Signature · 2 lines
Siemens AG, Foundational Technologies Linux Expert Center
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 116 lines · Jan Kiszka
Quoted 101 lines · Sai Sree Kartheek Adivi
Quoted 86 lines · Jan Kiszka
Quoted 85 lines · Sai Sree Kartheek Adivi
Quoted 61 lines · Jan Kiszka
Quoted 60 lines · Sai Sree Kartheek Adivi
Quoted 40 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>---
conf/machine/hihope-rzg2m.conf| 4 ++--
conf/machine/ti-am62px-sk.conf| 2 +-2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope- renamed from conf/machine/hihope-rzg2m.conf +0
-0rzg2m.conf
index0b3acf49..485683b2100644conf/machine/hihope-rzg2m.conf +1
-1@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64"
IMAGE_FSTYPES?= "wic"
-KERNEL_DEFCONFIG = "cip-kernel-config/ ${KERNEL_DEFCONFIG_VERSION}/
arm64/renesas_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"
USE_CIP_KERNEL_CONFIG= "1"
DTB_FILES= "r8a774a1-hihope-rzg2m-ex.dtb"IMAGE_BOOT_FILES= "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti-am62px- renamed from conf/machine/ti-am62px-sk.conf +0
-0sk.conf
index589f071e..bf3cf9ab100644conf/machine/ti-am62px-sk.conf +0
-0@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \Quoted 7 lines
/usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-evm.bin;tiboot3.bin"
USE_CIP_KERNEL_CONFIG= "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/ti_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports
pcr_hash'sha256' or 'ecc' - cannot create a encrypted device!But the tpm2 device is available and the
tpm2 getcap algorithmscommand confirms that the device supports sha256 and ecc.Quoted 8 lines
Quoted 4 lines
It's working with
ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead
of module.And there is no other module missing in the initramfs that might be built-in with your config? If you re-run the encryption hook manually from the initramfs later, that will work then?
yes. Once after the boot stops at initramfs with above error, running
/scripts/local-top/cryptmanually starts encryption without any issues.Quoted 8 lines
Quoted 7 lines
I'll run some more tests to properly identify the issue and post a fix in here or cip-kernel-config repo.
Quoted 1 line
WDOG_TIMEOUT= "0"Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Thanks for reporting. Finding the root cause will be important to avoid that other users will run into similar issues later on.
Yup, actively working on it.
Is initramfs-tee-ftpm-hook included in the build? That is supposed to wait for the ftpm to appear.
Just found out that it's not included in the build. The recipe itself is built but the local-top is not added to the
SRC_URI.Quoted 8 lines
There are 2 issues.
1.TEE_SUPPLICANT_IN_USERLANDis not set.
2. the initramfs-tee-ftpm-hook recipe has an issue. There is a missing :
while adding supp-user to the OVERRIDES.I'll send a patch fixing [1] in sometime. I've sent a PATCH on isar- users for [2] but I don't see it on the list. Will try to repost in sometime if I still don't find it.
I had a look at the config diff again but still didn't spot anything that could explain the different behavior. Fact is that the userland supplicant should no longer be used - pulling it in is likely only papering over the underlying synchronization issue we may still have.
Quoted 8 lines
Did you also try with just the initramfs-tee-ftpm-hook of isar fixed while keeping
TEE_SUPPLICANT_IN_USERLAND= "0"? If that still causes issues on your board, maybe you could add "set -x" to isar/meta/recipes-initramfs/initramfs-tee-ftpm-hook/files/local-top and also to recipes-initramfs/initramfs-crypt-hook/files/local-top-complete and share a boot log. I hope that this will tell us more about what is going on.
Now I recall:
https://github.com/ilbers/isar/commit/a1893507e495710297a2749efa3b2cb05e4f2881
There is no waiting for some tpm device anymore. I was assuming that this device node appears magically in time when the in-kernel supplicant is used. But I was likely misguided by the timing I saw inside qemu.
If you roll this isar commit back, then things should work with in- kernel supplicant as well. Please confirm, then I will provide some upstream patch which also updates the comments in the local-top file.
Well, this kind makes sense because we also need just polling loops when waiting on partitions to appear before decrypting or mounting them - same reason, I guess: The storage device has to be probed first. And the RPMB is attached to the same device, so it does not matter if we are waiting for an in-kernel or a userland supplicant, both also need to wait for the eMMC.
Jan
Signature · 2 lines
Siemens AG, Foundational Technologies Linux Expert Center
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 123 lines · Jan Kiszka
Quoted 102 lines · Jan Kiszka
Quoted 88 lines · Sai Sree Kartheek Adivi
Quoted 76 lines · Jan Kiszka
Quoted 75 lines · Sai Sree Kartheek Adivi
Quoted 59 lines · Jan Kiszka
Quoted 58 lines · Sai Sree Kartheek Adivi
Quoted 41 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>--- conf/machine/hihope-rzg2m.conf | 4 ++-- conf/machine/ti-am62px-sk.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope- renamed from conf/machine/hihope-rzg2m.conf +0
-0rzg2m.conf
index0b3acf49..485683b2100644conf/machine/hihope-rzg2m.conf +1
-1@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64" IMAGE_FSTYPES ?= "wic" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/
arm64/renesas_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"
USE_CIP_KERNEL_CONFIG= "1"
DTB_FILES= "r8a774a1-hihope-rzg2m-ex.dtb"IMAGE_BOOT_FILES= "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti-am62px- renamed from conf/machine/ti-am62px-sk.conf +0
-0sk.conf
index589f071e..bf3cf9ab100644conf/machine/ti-am62px-sk.conf +0
-0@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \ /usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-Quoted 6 lines
evm.bin;tiboot3.bin"
USE_CIP_KERNEL_CONFIG= "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/ti_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports
pcr_hash'sha256' or 'ecc' - cannot create a encrypted device!But the tpm2 device is available and the
tpm2 getcap algorithmscommand confirms that the device supports sha256 and ecc.Quoted 7 lines
Quoted 4 lines
It's working with
ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead
of module.And there is no other module missing in the initramfs that might be built-in with your config? If you re-run the encryption hook manually from the initramfs later, that will work then?
yes. Once after the boot stops at initramfs with above error, running
/scripts/local-top/cryptmanually starts encryption without any issues.Quoted 3 lines
Quoted 3 lines
I'll run some more tests to properly identify the issue and post a fix in here or cip-kernel-config repo.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
WDOG_TIMEOUT= "0"Thanks for reporting. Finding the root cause will be important to avoid that other users will run into similar issues later on.
Yup, actively working on it.
Is initramfs-tee-ftpm-hook included in the build? That is supposed to wait for the ftpm to appear.
Just found out that it's not included in the build. The recipe itself is built but the local-top is not added to the
SRC_URI.Quoted 8 lines
There are 2 issues.
1.TEE_SUPPLICANT_IN_USERLANDis not set.
2. the initramfs-tee-ftpm-hook recipe has an issue. There is a missing :
while adding supp-user to the OVERRIDES.I'll send a patch fixing [1] in sometime. I've sent a PATCH on isar- users for [2] but I don't see it on the list. Will try to repost in sometime if I still don't find it.
I had a look at the config diff again but still didn't spot anything that could explain the different behavior. Fact is that the userland supplicant should no longer be used - pulling it in is likely only papering over the underlying synchronization issue we may still have.
Quoted 8 lines
Did you also try with just the initramfs-tee-ftpm-hook of isar fixed while keeping
TEE_SUPPLICANT_IN_USERLAND= "0"? If that still causes issues on your board, maybe you could add "set -x" to isar/meta/recipes-initramfs/initramfs-tee-ftpm-hook/files/local-top and also to recipes-initramfs/initramfs-crypt-hook/files/local-top-complete and share a boot log. I hope that this will tell us more about what is going on.Now I recall:
https://github.com/ilbers/isar/commit/a1893507e495710297a2749efa3b2cb05e4f2881
There is no waiting for some tpm device anymore. I was assuming that this device node appears magically in time when the in-kernel supplicant is used. But I was likely misguided by the timing I saw inside qemu.
If you roll this isar commit back, then things should work with in- kernel supplicant as well. Please confirm, then I will provide some upstream patch which also updates the comments in the local-top file.
Quoted 6 lines
Well, this kind makes sense because we also need just polling loops when waiting on partitions to appear before decrypting or mounting them - same reason, I guess: The storage device has to be probed first. And the RPMB is attached to the same device, so it does not matter if we are waiting for an in-kernel or a userland supplicant, both also need to wait for the eMMC.
[1] on isar worked. Thanks for the patch Jan.
[1] - https://groups.google.com/g/isar-users/c/sVJxkjDm6Uc
Quoted 2 lines
Jan
Re: [isar-cip-core][PATCH 3/6] arm64: Switch to cip_merged_defconfig
Quoted 143 lines · Sai Sree Kartheek Adivi
Quoted 134 lines · Jan Kiszka
Quoted 112 lines · Jan Kiszka
Quoted 103 lines · Sai Sree Kartheek Adivi
Quoted 83 lines · Jan Kiszka
Quoted 82 lines · Sai Sree Kartheek Adivi
Quoted 64 lines · Jan Kiszka
Quoted 63 lines · Sai Sree Kartheek Adivi
Quoted 43 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Allows to use the same kernel for all arm64 targets.
Signed-off-by Jan Kiszka <[email protected]>---
conf/machine/hihope-rzg2m.conf| 4 ++--
conf/machine/ti-am62px-sk.conf| 2 +-2 files changed, 3 insertions(+), 3 deletions(-)conf/machine/hihope- renamed from conf/machine/hihope-rzg2m.conf +0
-0rzg2m.conf
index0b3acf49..485683b2100644conf/machine/hihope-rzg2m.conf +1
-1@@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2019 +# Copyright (c) Siemens AG, 2019-2025 # # Authors: # Quirin Gylstorff <[email protected]>@@ -13,7 +13,7 @@ DISTRO_ARCH = "arm64"
IMAGE_FSTYPES?= "wic" -KERNEL_DEFCONFIG = "cip-kernel-config/ ${KERNEL_DEFCONFIG_VERSION}/ arm64/renesas_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/ ${KERNEL_DEFCONFIG_VERSION}/ arm64/cip_merged_defconfig"USE_CIP_KERNEL_CONFIG= "1"
DTB_FILES= "r8a774a1-hihope-rzg2m-ex.dtb"IMAGE_BOOT_FILES= "${KERNEL_IMAGE} ${DTB_FILES}"conf/machine/ti- renamed from conf/machine/ti-am62px-sk.conf +0
-0am62px-
sk.conf
index589f071e..bf3cf9ab100644conf/machine/ti-am62px-sk.conf +0
-0@@ -23,6 +23,6 @@ IMAGE_BOOT_FILES = " \
/usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-Quoted 8 lines
evm.bin;tiboot3.bin"
USE_CIP_KERNEL_CONFIG= "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/
${KERNEL_DEFCONFIG_VERSION}/
arm64/ti_defconfig"
+KERNEL_DEFCONFIG = "cip-kernel-config/
${KERNEL_DEFCONFIG_VERSION}/
arm64/cip_merged_defconfig"Jan, I'm seeing a boot issue after this change. The boot stops at initramfs with the following log
No tpm device exists or supports
pcr_hash'sha256' or 'ecc' - cannot
create a encrypted device!But the tpm2 device is available and the
tpm2 getcap algorithmscommand confirms that the device supports sha256 and ecc.Quoted 8 lines
Quoted 4 lines
It's working with
ti_defconfig. So looks like there is some timing issue / race condition when the tpm support is built as inbuilt instead
of module.And there is no other module missing in the initramfs that might be built-in with your config? If you re-run the encryption hook manually
from the initramfs later, that will work then?yes. Once after the boot stops at initramfs with above error, running
/scripts/local-top/cryptmanually starts encryption without any issues.Quoted 4 lines
Quoted 4 lines
I'll run some more tests to properly identify the issue and post a fix
in here or cip-kernel-config repo.Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
WDOG_TIMEOUT= "0"Thanks for reporting. Finding the root cause will be important to avoid
that other users will run into similar issues later on.Yup, actively working on it.
Is initramfs-tee-ftpm-hook included in the build? That is supposed to wait for the ftpm to appear.
Just found out that it's not included in the build. The recipe itself is
built but the local-top is not added to theSRC_URI.There are 2 issues.
1.TEE_SUPPLICANT_IN_USERLANDis not set.
2. the initramfs-tee-ftpm-hook recipe has an issue. There is a missing :
while adding supp-user to the OVERRIDES.Quoted 3 lines
I'll send a patch fixing [1] in sometime. I've sent a PATCH on isar- users for [2] but I don't see it on the list. Will try to repost in sometime if I still don't find it.
I had a look at the config diff again but still didn't spot anything that could explain the different behavior. Fact is that the userland supplicant should no longer be used - pulling it in is likely only papering over the underlying synchronization issue we may still have.
Quoted 8 lines
Did you also try with just the initramfs-tee-ftpm-hook of isar fixed while keeping
TEE_SUPPLICANT_IN_USERLAND= "0"? If that still causes issues on your board, maybe you could add "set -x" to isar/meta/recipes-initramfs/initramfs-tee-ftpm-hook/files/local-top and also to recipes-initramfs/initramfs-crypt-hook/files/local-top-complete and share a boot log. I hope that this will tell us more about what is going on.Now I recall:
https://github.com/ilbers/isar/commit/
a1893507e495710297a2749efa3b2cb05e4f2881There is no waiting for some tpm device anymore. I was assuming that this device node appears magically in time when the in-kernel supplicant is used. But I was likely misguided by the timing I saw inside qemu.
If you roll this isar commit back, then things should work with in- kernel supplicant as well. Please confirm, then I will provide some upstream patch which also updates the comments in the local-top file.
Quoted 6 lines
Well, this kind makes sense because we also need just polling loops when waiting on partitions to appear before decrypting or mounting them - same reason, I guess: The storage device has to be probed first. And the RPMB is attached to the same device, so it does not matter if we are waiting for an in-kernel or a userland supplicant, both also need to wait for the eMMC.
Quoted 4 lines
[1] on isar worked. Thanks for the patch Jan.
Thanks for confirming! It's all in isar-cip-core next as well now.
Jan
Signature · 2 lines
Siemens AG, Foundational Technologies Linux Expert Center
PATCH 4/6 linux-cip: Refactor KERNEL_DEFCONFIG initialization
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Now that all targets are on cip_merged_defconfig, we can make this the standard value of KERNEL_DEFCONFIG if USE_CIP_KERNEL_CONFIG is set. This is logically best done in cip-kernel-config.inc.
While at it, switch to bb.utils.to_boolean for the evaluation of USE_CIP_KERNEL_CONFIG.
--- conf/machine/bbb.conf | 1 - conf/machine/hihope-rzg2m.conf | 1 - conf/machine/iwg20m.conf | 1 - conf/machine/qemu-amd64.conf | 1 - conf/machine/qemu-arm.conf | 1 - conf/machine/qemu-arm64.conf | 1 - conf/machine/qemu-riscv64.conf | 2 -- conf/machine/ti-am62px-sk.conf | 1 - conf/machine/x86-uefi.conf | 1 - recipes-kernel/linux/cip-kernel-config.inc | 12 ++++++++++-- recipes-kernel/linux/linux-cip-common.inc | 3 --- 11 files changed, 10 insertions(+), 15 deletions(-)
conf/machine/bbb.conf +0 -1
@@ -14,7 +14,6 @@ IMAGER_INSTALL:wic += "u-boot-bbb ${SYSTEMD_BOOTLOADER_INSTALL}" IMAGER_BUILD_DEPS += "u-boot-bbb" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" # for SWUpdate setups: watchdog is configured in U-Boot WDOG_TIMEOUT = "0"
conf/machine/hihope-rzg2m.conf +0 -1
@@ -13,7 +13,6 @@ DISTRO_ARCH = "arm64" IMAGE_FSTYPES ?= "wic" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig" USE_CIP_KERNEL_CONFIG = "1" DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
conf/machine/iwg20m.conf +0 -1
@@ -16,7 +16,6 @@ BAUDRATE_TTY = "115200" # Setting for kernel and boot USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" DTB_FILES = "r8a7743-iwg20d-q7-dbcm-ca.dtb" KERNEL_IMAGE="zImage" IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
conf/machine/qemu-amd64.conf +0 -1
@@ -10,6 +10,5 @@ DISTRO_ARCH = "amd64" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_merged_defconfig" PREFERRED_PROVIDER_factory-reset-helper:swupdate = "factory-reset-helper-efi"
conf/machine/qemu-arm.conf +0 -1
@@ -11,7 +11,6 @@ DISTRO_ARCH = "armhf" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_merged_defconfig" # watchdog is not yet supported in our QEMU executor for this platform, disable it WDOG_TIMEOUT = "0"
conf/machine/qemu-arm64.conf +0 -1
@@ -12,7 +12,6 @@ IMAGE_FSTYPES ?= "ext4" IMAGE_FSTYPES:append:ftpm-stmm = " qemu-emmc" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig" # watchdog is not yet supported in our QEMU executor for this platform, disable it WDOG_TIMEOUT = "0"
conf/machine/qemu-riscv64.conf +0 -2
@@ -14,7 +14,5 @@ DISTRO_ARCH = "riscv64" IMAGE_FSTYPES ?= "ext4" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/riscv/cip_merged_defconfig" - # watchdog is not yet supported in our QEMU executor for this platform, disable it WDOG_TIMEOUT = "0"
conf/machine/ti-am62px-sk.conf +0 -1
@@ -23,6 +23,5 @@ IMAGE_BOOT_FILES = " \ /usr/lib/u-boot/${MACHINE}/tiboot3-am62px-hs-fs-evm.bin;tiboot3.bin" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/cip_merged_defconfig" WDOG_TIMEOUT = "0"
conf/machine/x86-uefi.conf +0 -1
@@ -12,6 +12,5 @@ IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "x86_64-generic.wks" IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}" USE_CIP_KERNEL_CONFIG = "1" -KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_merged_defconfig" PREFERRED_PROVIDER_factory-reset-helper = "factory-reset-helper-efi"
recipes-kernel/linux/cip-kernel-config.inc +10 -2
@@ -12,11 +12,19 @@ SRC_URI:append = " ${@ \ 'git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;branch=master;destsuffix=cip-kernel-config;name=cip-kernel-config \ file://no-tpm-hwrng.cfg' \ - if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \ + if bb.utils.to_boolean(d.getVar('USE_CIP_KERNEL_CONFIG')) else '' \ }" SRCREV_cip-kernel-config ?= "ba0204aa6c1c5a41dcb4fa1087b5ef5dd3ebf81f" do_fetch[vardeps] += "SRCREV_cip-kernel-config" -KBUILD_DEPENDS:append = "${@', lzop, lz4' if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else ''}" +KERNEL_DEFCONFIG_VERSION ?= "${KERNEL_MAJOR_MINOR}.y-cip" +KERNEL_DEFCONFIG ?= "${@ \ + 'cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/${KERNEL_ARCH}/cip_merged_defconfig' \ + if bb.utils.to_boolean(d.getVar('USE_CIP_KERNEL_CONFIG')) else \ + '${MACHINE}_defconfig'}" + +KBUILD_DEPENDS:append = "${@ \ + ', lzop, lz4' \ + if bb.utils.to_boolean(d.getVar('USE_CIP_KERNEL_CONFIG')) else ''}"
recipes-kernel/linux/linux-cip-common.inc +0 -3
@@ -11,9 +11,6 @@ FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" -KERNEL_DEFCONFIG_VERSION ?= "${KERNEL_MAJOR_MINOR}.y-cip" -KERNEL_DEFCONFIG ?= "${MACHINE}_defconfig" - require recipes-kernel/linux/linux-custom.inc require recipes-kernel/linux/cip-kernel-config.inc
Signature · 1 line
2.51.0
PATCH 5/6 u-boot-ti-am62px-sk: Drop redundant or unused DEBIAN_BUILD_DEPENDS
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
The 2 ssl deps are already added by the common inc, and grub is uneeded.
--- recipes-bsp/u-boot/u-boot-ti-am62px-sk_2025.07.bb | 1 - 1 file changed, 1 deletion(-)
recipes-bsp/u-boot/u-boot-ti-am62px-sk_2025.07.bb +0 -1
@@ -47,7 +47,6 @@ OVERRIDES .= ":ftpm-stmm" DEPENDS += "trusted-firmware-a-ti-k3 optee-os-ti-k3" DEBIAN_BUILD_DEPENDS =. "gcc-arm-linux-gnueabihf, \ - libssl-dev:native, libssl-dev, grub-common, \ swig, python3-dev:native, python3-setuptools, python3-pyelftools, \ python3-jsonschema:native, yamllint:native, \ trusted-firmware-a-ti-k3, optee-os-ti-k3,"
Signature · 1 line
2.51.0
PATCH 6/6 ti-am62px-sk: Switch wks files to gpt-hybrid
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Isar will deprecate the boot-hybrid plugin because native wic supports this now as well.
--- wic/ti-am62px-sk-efibootguard-secureboot.wks.in | 4 ++-- wic/ti-am62px-sk-efibootguard.wks.in | 4 ++-- wic/ti-am62px-sk.wks | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
wic/ti-am62px-sk-efibootguard-secureboot.wks.in +2 -2
@@ -8,7 +8,7 @@ # # Boot partition containing Bootloader binaries -part /boot/firmware --source bootimg-partition --fstype=vfat --label firmware --active --align 1024 --size 16M --overhead-factor 1 --extra-space 0 --use-uuid --part-type E3C9E316-0B5C-4DB8-817D-F92DF00215AE +part /boot/firmware --source bootimg-partition --fstype=vfat --label firmware --active --align 1024 --size 16M --overhead-factor 1 --extra-space 0 --use-uuid --part-type E3C9E316-0B5C-4DB8-817D-F92DF00215AE --mbr include ebg-signed-sysparts.inc
@@ -20,4 +20,4 @@ part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B} part /var --fstype=ext4 --label var --align 1024 --fixed-size 512M --fsuuid 96be3374-4258-11ee-be56-0242ac120002 --uuid 423f0a2e-b9b3-4615-85be-2a4261fa32d9 ${WIC_HOME_PARTITION} -bootloader --ptable gpt --source hybrid-boot --timeout=0 --append "rootwait rw console=ttyS2,115200n8" +bootloader --ptable gpt-hybrid --timeout=0 --append "rootwait rw console=ttyS2,115200n8"
wic/ti-am62px-sk-efibootguard.wks.in +2 -2
@@ -8,7 +8,7 @@ # # Boot partition containing Bootloader binaries -part /boot/firmware --source bootimg-partition --fstype=vfat --label firmware --active --align 1024 --size 16M --overhead-factor 1 --extra-space 0 --use-uuid --part-type E3C9E316-0B5C-4DB8-817D-F92DF00215AE +part /boot/firmware --source bootimg-partition --fstype=vfat --label firmware --active --align 1024 --size 16M --overhead-factor 1 --extra-space 0 --use-uuid --part-type E3C9E316-0B5C-4DB8-817D-F92DF00215AE --mbr include ebg-sysparts.inc
@@ -20,4 +20,4 @@ part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B} part /var --fstype=ext4 --label var --align 1024 --fixed-size 512M --fsuuid 96be3374-4258-11ee-be56-0242ac120002 --uuid 423f0a2e-b9b3-4615-85be-2a4261fa32d9 --exclude-path boot/ ${WIC_HOME_PARTITION} -bootloader --ptable gpt --source hybrid-boot --timeout=0 --append "rootwait rw console=ttyS2,115200n8" +bootloader --ptable gpt-hybrid --timeout=0 --append "rootwait rw console=ttyS2,115200n8"
wic/ti-am62px-sk.wks +2 -2
@@ -7,9 +7,9 @@ # SPDX-License-Identifier: MIT # -part /boot/firmware --source bootimg-partition --fstype=vfat --label firmware --active --align 1024 --size 16M --overhead-factor 1 --extra-space 0 --use-uuid --part-type E3C9E316-0B5C-4DB8-817D-F92DF00215AE +part /boot/firmware --source bootimg-partition --fstype=vfat --label firmware --active --align 1024 --size 16M --overhead-factor 1 --extra-space 0 --use-uuid --part-type E3C9E316-0B5C-4DB8-817D-F92DF00215AE --mbr part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --label efi --part-type EF00 --align 1024 --use-uuid part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ -bootloader --ptable gpt --source hybrid-boot --timeout=0 --append "rootwait rw" +bootloader --ptable gpt-hybrid --timeout=0 --append "rootwait rw"
Signature · 1 line
2.51.0