diff options
author | Manorit Chawdhry <m-chawdhry@ti.com> | 2025-06-27 10:56:50 +0530 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2025-07-16 14:15:14 -0500 |
commit | 3ecef14093914bb95fdc69e929a18cd7219ff01f (patch) | |
tree | 7b05e1312e2e25824c237a5acb8776157a2855a0 | |
parent | 323140901249a97ce621db0890cd19bca3ff6501 (diff) | |
download | meta-ti-3ecef14093914bb95fdc69e929a18cd7219ff01f.tar.gz |
Revert "conf: machine: k3: disable all fit signing for uboot"
FIT signing was disabled in the past as it was interfering with multi
DTB usecase in binman, and it was thought that the binman signing being
done is equivalent to UBOOT_SIGN_ENABLE.
Though looking at the sources, UBOOT_SIGN_ENABLE is actually used to
sign the kernel FIT Image instead and the name UBOOT actually specifies
that it's used in tandom with U-boot. During the signing process, mkimage
from U-boot is used to pack the kernel FIT Image and along with that,
one DTB from U-boot is also passed to the mkimage command. The DTB that
gets passed gets the key embedded in it that is used to verify the
kernel FIT image at runtime.
Now this signed DTB is packed in U-boot by triggering a rebuild with
EXT_DTB argument in the U-boot build process. However, this failed as
there was a U-boot bug which was not looking at the packed sources
properly with the multi DTB usecase.
Now that a U-boot fix is available [0], revert that commit which
disabled the FIT signing.
This reverts commit 9656b79cb557a46d2611b67e7e51702f6da05594.
[0]: https://lore.kernel.org/all/20250626-b4-upstream-fix-icssg-fit-v1-1-95eff1c853a4@ti.com/
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/conf/machine/include/k3.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index b743c8cc..0e8729df 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc | |||
@@ -20,6 +20,10 @@ SPL_BINARY = "tispl.bin" | |||
20 | SPL_BINARYNAME = "tispl.bin" | 20 | SPL_BINARYNAME = "tispl.bin" |
21 | UBOOT_SUFFIX = "img" | 21 | UBOOT_SUFFIX = "img" |
22 | 22 | ||
23 | UBOOT_SIGN_ENABLE = "1" | ||
24 | UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb" | ||
25 | UBOOT_SIGN_KEYNAME ?= "custMpk" | ||
26 | UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys" | ||
23 | FIT_HASH_ALG ?= "sha512" | 27 | FIT_HASH_ALG ?= "sha512" |
24 | FIT_SIGN_ALG ?= "rsa4096" | 28 | FIT_SIGN_ALG ?= "rsa4096" |
25 | 29 | ||