* [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition
@ 2022-06-02 20:24 Andrew Davis
2022-06-02 20:24 ` [meta-ti][dunfell][PATCH 2/2] conf: machine: Make multi-certificate image the default Andrew Davis
2022-06-03 21:01 ` [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition Denys Dmytriyenko
0 siblings, 2 replies; 6+ messages in thread
From: Andrew Davis @ 2022-06-02 20:24 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, Manorit Chawdhry, meta-ti; +Cc: Andrew Davis
From: Manorit Chawdhry <m-chawdhry@ti.com>
IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to
incomplete binaries in /boot and the naming of the binaries were not
correct.
Fixes /boot partition for HS devices.
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@ti.com>
---
conf/machine/am64xx-hs-evm.conf | 4 +---
conf/machine/am65xx-hs-evm.conf | 4 +---
conf/machine/include/k3.inc | 5 +++--
conf/machine/j7-hs-evm.conf | 4 +---
conf/machine/j7200-hs-evm.conf | 4 +---
5 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
index 44e81463..c0d904e1 100644
--- a/conf/machine/am64xx-hs-evm.conf
+++ b/conf/machine/am64xx-hs-evm.conf
@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
UBOOT_DTBO_OFFSET = "0x00010000"
SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_IMAGE = "u-boot.img_HS"
TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
index e4eebb6a..a7514663 100644
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/conf/machine/am65xx-hs-evm.conf
@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
UBOOT_DTBO_OFFSET = "0x00010000"
SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_IMAGE = "u-boot.img_HS"
TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index e0970698..f85e6b98 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
SPL_BINARY = "tispl.bin"
+SPL_BINARYNAME = "tispl.bin"
UBOOT_SUFFIX = "img"
EXTRA_IMAGEDEPENDS += "virtual/bootloader"
@@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
-IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
+IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
+IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
index f2e3ccf5..629a5ccd 100644
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-hs-evm.conf
@@ -15,9 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
UBOOT_DTBO_OFFSET = "0x00010000"
SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_IMAGE = "u-boot.img_HS"
BBMULTICONFIG += "k3r5-sr1-1"
diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
index a5bd637e..54b7906f 100644
--- a/conf/machine/j7200-hs-evm.conf
+++ b/conf/machine/j7200-hs-evm.conf
@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
UBOOT_DTBO_OFFSET = "0x00010000"
SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_IMAGE = "u-boot.img_HS"
TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-ti][dunfell][PATCH 2/2] conf: machine: Make multi-certificate image the default
2022-06-02 20:24 [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition Andrew Davis
@ 2022-06-02 20:24 ` Andrew Davis
2022-06-03 21:02 ` Denys Dmytriyenko
2022-06-03 21:01 ` [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition Denys Dmytriyenko
1 sibling, 1 reply; 6+ messages in thread
From: Andrew Davis @ 2022-06-02 20:24 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, Manorit Chawdhry, meta-ti; +Cc: Andrew Davis
Only the first two K3 devices do not support multi-cert boot so
lets make multi-cert the default and only add back sysfw.itb
for these two devices.
Signed-off-by: Andrew Davis <afd@ti.com>
---
conf/machine/include/am62xx.inc | 3 ---
conf/machine/include/am64xx.inc | 3 ---
conf/machine/include/am65xx.inc | 5 ++++-
conf/machine/include/j7.inc | 2 --
conf/machine/include/k3.inc | 5 +----
conf/machine/j7-evm.conf | 3 +++
conf/machine/j7-hs-evm.conf | 1 -
conf/machine/j7200-evm.conf | 3 ---
conf/machine/j721s2-evm.conf | 3 ---
9 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc
index ff857b97..7c902724 100644
--- a/conf/machine/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -8,9 +8,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
TFA_K3_SYSTEM_SUSPEND = "1"
-# AM62 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
index 7646c70a..bc5b085c 100644
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -13,9 +13,6 @@ KERNEL_DEVICETREE = " \
ti/k3-am642-evm-nand.dtbo \
"
-# AM64 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
index 1898f19c..b70d212f 100644
--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -22,9 +22,12 @@ KERNEL_DEVICETREE = " \
BBMULTICONFIG += "k3r5-sr2"
-# Use default IMAGE_BOOT_FILES_LEGACY files
+# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+IMAGE_BOOT_FILES += "sysfw.itb"
+
# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
+
do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
index d3eda1a8..c187f299 100644
--- a/conf/machine/include/j7.inc
+++ b/conf/machine/include/j7.inc
@@ -4,8 +4,6 @@ SOC_FAMILY_append = ":j7"
OPTEEMACHINE = "k3-j721e"
OPTEEOUTPUTMACHINE = "k3"
-# Use default IMAGE_BOOT_FILES_LEGACY files
-
# Set the list of device targets for ti-pdk class recipes
TI_PDK_LIMIT_SOCS = "j721e j7200"
TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm"
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index f85e6b98..24741dee 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -41,10 +41,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
-IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
-
-IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
+IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
WKS_FILE ?= "sdimage-2part.wks"
do_image_wic[depends] += "virtual/bootloader:do_deploy"
diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf
index 1f47f00c..514695d6 100644
--- a/conf/machine/j7-evm.conf
+++ b/conf/machine/j7-evm.conf
@@ -9,6 +9,9 @@ MACHINE_FEATURES += "gpu"
SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+IMAGE_BOOT_FILES += "sysfw.itb"
+
KERNEL_DEVICETREE = " \
ti/k3-j721e-common-proc-board.dtb \
ti/k3-j721e-proc-board-tps65917.dtb \
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
index 629a5ccd..9b95ce7a 100644
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-hs-evm.conf
@@ -19,7 +19,6 @@ UBOOT_IMAGE = "u-boot.img_HS"
BBMULTICONFIG += "k3r5-sr1-1"
-# Use default IMAGE_BOOT_FILES_LEGACY files
# Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0
IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
index 2565c90c..c8a03a7b 100644
--- a/conf/machine/j7200-evm.conf
+++ b/conf/machine/j7200-evm.conf
@@ -13,8 +13,5 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "j7200_evm_a72_config"
-# J7200 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
index e5ed0b73..a8898f12 100644
--- a/conf/machine/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -17,8 +17,5 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-# J721S2 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition
2022-06-02 20:24 [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition Andrew Davis
2022-06-02 20:24 ` [meta-ti][dunfell][PATCH 2/2] conf: machine: Make multi-certificate image the default Andrew Davis
@ 2022-06-03 21:01 ` Denys Dmytriyenko
2022-06-06 14:26 ` Manorit Chawdhry
1 sibling, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-06-03 21:01 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, Manorit Chawdhry, meta-ti
On Thu, Jun 02, 2022 at 03:24:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> From: Manorit Chawdhry <m-chawdhry@ti.com>
>
> IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to
> incomplete binaries in /boot and the naming of the binaries were not
> correct.
>
> Fixes /boot partition for HS devices.
>
> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
> [afd: Extended fix to all HS platforms]
> Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> conf/machine/am64xx-hs-evm.conf | 4 +---
> conf/machine/am65xx-hs-evm.conf | 4 +---
> conf/machine/include/k3.inc | 5 +++--
> conf/machine/j7-hs-evm.conf | 4 +---
> conf/machine/j7200-hs-evm.conf | 4 +---
> 5 files changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
> index 44e81463..c0d904e1 100644
> --- a/conf/machine/am64xx-hs-evm.conf
> +++ b/conf/machine/am64xx-hs-evm.conf
> @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
> UBOOT_DTBO_OFFSET = "0x00010000"
>
> SPL_BINARY = "tispl.bin_HS"
> -SPL_BINARYNAME = "tispl.bin"
> -UBOOT_BINARY = "u-boot.img_HS"
> -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> +UBOOT_IMAGE = "u-boot.img_HS"
>
> TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
> diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
> index e4eebb6a..a7514663 100644
> --- a/conf/machine/am65xx-hs-evm.conf
> +++ b/conf/machine/am65xx-hs-evm.conf
> @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
> UBOOT_DTBO_OFFSET = "0x00010000"
>
> SPL_BINARY = "tispl.bin_HS"
> -SPL_BINARYNAME = "tispl.bin"
> -UBOOT_BINARY = "u-boot.img_HS"
> -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> +UBOOT_IMAGE = "u-boot.img_HS"
>
> TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
> diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
> index e0970698..f85e6b98 100644
> --- a/conf/machine/include/k3.inc
> +++ b/conf/machine/include/k3.inc
> @@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
> UBOOT_LOADADDRESS = "0x80008000"
>
> SPL_BINARY = "tispl.bin"
> +SPL_BINARYNAME = "tispl.bin"
> UBOOT_SUFFIX = "img"
>
> EXTRA_IMAGEDEPENDS += "virtual/bootloader"
> @@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
>
> IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
>
> -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
> -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
> +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
> +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
>
> IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
>
> diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
> index f2e3ccf5..629a5ccd 100644
> --- a/conf/machine/j7-hs-evm.conf
> +++ b/conf/machine/j7-hs-evm.conf
> @@ -15,9 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
> UBOOT_DTBO_OFFSET = "0x00010000"
>
> SPL_BINARY = "tispl.bin_HS"
> -SPL_BINARYNAME = "tispl.bin"
> -UBOOT_BINARY = "u-boot.img_HS"
> -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> +UBOOT_IMAGE = "u-boot.img_HS"
>
> BBMULTICONFIG += "k3r5-sr1-1"
>
> diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
> index a5bd637e..54b7906f 100644
> --- a/conf/machine/j7200-hs-evm.conf
> +++ b/conf/machine/j7200-hs-evm.conf
> @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
> UBOOT_DTBO_OFFSET = "0x00010000"
>
> SPL_BINARY = "tispl.bin_HS"
> -SPL_BINARYNAME = "tispl.bin"
> -UBOOT_BINARY = "u-boot.img_HS"
> -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> +UBOOT_IMAGE = "u-boot.img_HS"
>
> TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
> --
> 2.36.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-ti][dunfell][PATCH 2/2] conf: machine: Make multi-certificate image the default
2022-06-02 20:24 ` [meta-ti][dunfell][PATCH 2/2] conf: machine: Make multi-certificate image the default Andrew Davis
@ 2022-06-03 21:02 ` Denys Dmytriyenko
0 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-06-03 21:02 UTC (permalink / raw)
To: afd; +Cc: Ryan Eatmon, Manorit Chawdhry, meta-ti
On Thu, Jun 02, 2022 at 03:24:48PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> Only the first two K3 devices do not support multi-cert boot so
> lets make multi-cert the default and only add back sysfw.itb
> for these two devices.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> conf/machine/include/am62xx.inc | 3 ---
> conf/machine/include/am64xx.inc | 3 ---
> conf/machine/include/am65xx.inc | 5 ++++-
> conf/machine/include/j7.inc | 2 --
> conf/machine/include/k3.inc | 5 +----
> conf/machine/j7-evm.conf | 3 +++
> conf/machine/j7-hs-evm.conf | 1 -
> conf/machine/j7200-evm.conf | 3 ---
> conf/machine/j721s2-evm.conf | 3 ---
> 9 files changed, 8 insertions(+), 20 deletions(-)
>
> diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc
> index ff857b97..7c902724 100644
> --- a/conf/machine/include/am62xx.inc
> +++ b/conf/machine/include/am62xx.inc
> @@ -8,9 +8,6 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
> TFA_K3_SYSTEM_SUSPEND = "1"
>
> -# AM62 supports multi-certificate images, use the same
> -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
> -
> do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
>
> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
> index 7646c70a..bc5b085c 100644
> --- a/conf/machine/include/am64xx.inc
> +++ b/conf/machine/include/am64xx.inc
> @@ -13,9 +13,6 @@ KERNEL_DEVICETREE = " \
> ti/k3-am642-evm-nand.dtbo \
> "
>
> -# AM64 supports multi-certificate images, use the same
> -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
> -
> do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
>
> diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
> index 1898f19c..b70d212f 100644
> --- a/conf/machine/include/am65xx.inc
> +++ b/conf/machine/include/am65xx.inc
> @@ -22,9 +22,12 @@ KERNEL_DEVICETREE = " \
>
> BBMULTICONFIG += "k3r5-sr2"
>
> -# Use default IMAGE_BOOT_FILES_LEGACY files
> +# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
> +IMAGE_BOOT_FILES += "sysfw.itb"
> +
> # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
> IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
> +
> do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
> do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
>
> diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
> index d3eda1a8..c187f299 100644
> --- a/conf/machine/include/j7.inc
> +++ b/conf/machine/include/j7.inc
> @@ -4,8 +4,6 @@ SOC_FAMILY_append = ":j7"
> OPTEEMACHINE = "k3-j721e"
> OPTEEOUTPUTMACHINE = "k3"
>
> -# Use default IMAGE_BOOT_FILES_LEGACY files
> -
> # Set the list of device targets for ti-pdk class recipes
> TI_PDK_LIMIT_SOCS = "j721e j7200"
> TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm"
> diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
> index f85e6b98..24741dee 100644
> --- a/conf/machine/include/k3.inc
> +++ b/conf/machine/include/k3.inc
> @@ -41,10 +41,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
>
> IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
>
> -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
> -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
> -
> -IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
> +IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
>
> WKS_FILE ?= "sdimage-2part.wks"
> do_image_wic[depends] += "virtual/bootloader:do_deploy"
> diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf
> index 1f47f00c..514695d6 100644
> --- a/conf/machine/j7-evm.conf
> +++ b/conf/machine/j7-evm.conf
> @@ -9,6 +9,9 @@ MACHINE_FEATURES += "gpu"
> SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
> SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
> +# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
> +IMAGE_BOOT_FILES += "sysfw.itb"
> +
> KERNEL_DEVICETREE = " \
> ti/k3-j721e-common-proc-board.dtb \
> ti/k3-j721e-proc-board-tps65917.dtb \
> diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
> index 629a5ccd..9b95ce7a 100644
> --- a/conf/machine/j7-hs-evm.conf
> +++ b/conf/machine/j7-hs-evm.conf
> @@ -19,7 +19,6 @@ UBOOT_IMAGE = "u-boot.img_HS"
>
> BBMULTICONFIG += "k3r5-sr1-1"
>
> -# Use default IMAGE_BOOT_FILES_LEGACY files
> # Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0
> IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
> do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
> diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
> index 2565c90c..c8a03a7b 100644
> --- a/conf/machine/j7200-evm.conf
> +++ b/conf/machine/j7200-evm.conf
> @@ -13,8 +13,5 @@ KERNEL_DEVICETREE = " \
>
> UBOOT_MACHINE = "j7200_evm_a72_config"
>
> -# J7200 supports multi-certificate images, use the same
> -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
> -
> do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf
> index e5ed0b73..a8898f12 100644
> --- a/conf/machine/j721s2-evm.conf
> +++ b/conf/machine/j721s2-evm.conf
> @@ -17,8 +17,5 @@ KERNEL_DEVICETREE = " \
>
> UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
>
> -# J721S2 supports multi-certificate images, use the same
> -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
> -
> do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> --
> 2.36.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#14778): https://lists.yoctoproject.org/g/meta-ti/message/14778
> Mute This Topic: https://lists.yoctoproject.org/mt/91508259/3617104
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [denis@denix.org]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition
2022-06-03 21:01 ` [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition Denys Dmytriyenko
@ 2022-06-06 14:26 ` Manorit Chawdhry
2022-06-06 14:27 ` Andrew Davis
0 siblings, 1 reply; 6+ messages in thread
From: Manorit Chawdhry @ 2022-06-06 14:26 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: afd, Ryan Eatmon, meta-ti
On 17:01-20220603, Denys Dmytriyenko wrote:
> On Thu, Jun 02, 2022 at 03:24:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> > From: Manorit Chawdhry <m-chawdhry@ti.com>
> >
> > IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to
> > incomplete binaries in /boot and the naming of the binaries were not
> > correct.
> >
> > Fixes /boot partition for HS devices.
> >
> > Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
> > [afd: Extended fix to all HS platforms]
> > Signed-off-by: Andrew Davis <afd@ti.com>
>
> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
>
>
Hi,
Running this patch on j721e-hsevm seems to break the secure boot mechanism on
u-boot stage. Will need fixes.
Regards,
Manorit
> > ---
> > conf/machine/am64xx-hs-evm.conf | 4 +---
> > conf/machine/am65xx-hs-evm.conf | 4 +---
> > conf/machine/include/k3.inc | 5 +++--
> > conf/machine/j7-hs-evm.conf | 4 +---
> > conf/machine/j7200-hs-evm.conf | 4 +---
> > 5 files changed, 7 insertions(+), 14 deletions(-)
> >
> > diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
> > index 44e81463..c0d904e1 100644
> > --- a/conf/machine/am64xx-hs-evm.conf
> > +++ b/conf/machine/am64xx-hs-evm.conf
> > @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
> > UBOOT_DTBO_OFFSET = "0x00010000"
> >
> > SPL_BINARY = "tispl.bin_HS"
> > -SPL_BINARYNAME = "tispl.bin"
> > -UBOOT_BINARY = "u-boot.img_HS"
> > -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> > +UBOOT_IMAGE = "u-boot.img_HS"
> >
> > TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
> > diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
> > index e4eebb6a..a7514663 100644
> > --- a/conf/machine/am65xx-hs-evm.conf
> > +++ b/conf/machine/am65xx-hs-evm.conf
> > @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
> > UBOOT_DTBO_OFFSET = "0x00010000"
> >
> > SPL_BINARY = "tispl.bin_HS"
> > -SPL_BINARYNAME = "tispl.bin"
> > -UBOOT_BINARY = "u-boot.img_HS"
> > -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> > +UBOOT_IMAGE = "u-boot.img_HS"
> >
> > TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
> > diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
> > index e0970698..f85e6b98 100644
> > --- a/conf/machine/include/k3.inc
> > +++ b/conf/machine/include/k3.inc
> > @@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
> > UBOOT_LOADADDRESS = "0x80008000"
> >
> > SPL_BINARY = "tispl.bin"
> > +SPL_BINARYNAME = "tispl.bin"
> > UBOOT_SUFFIX = "img"
> >
> > EXTRA_IMAGEDEPENDS += "virtual/bootloader"
> > @@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
> >
> > IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
> >
> > -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
> > -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
> > +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
> > +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
> >
> > IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
> >
> > diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
> > index f2e3ccf5..629a5ccd 100644
> > --- a/conf/machine/j7-hs-evm.conf
> > +++ b/conf/machine/j7-hs-evm.conf
> > @@ -15,9 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
> > UBOOT_DTBO_OFFSET = "0x00010000"
> >
> > SPL_BINARY = "tispl.bin_HS"
> > -SPL_BINARYNAME = "tispl.bin"
> > -UBOOT_BINARY = "u-boot.img_HS"
> > -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> > +UBOOT_IMAGE = "u-boot.img_HS"
> >
> > BBMULTICONFIG += "k3r5-sr1-1"
> >
> > diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
> > index a5bd637e..54b7906f 100644
> > --- a/conf/machine/j7200-hs-evm.conf
> > +++ b/conf/machine/j7200-hs-evm.conf
> > @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
> > UBOOT_DTBO_OFFSET = "0x00010000"
> >
> > SPL_BINARY = "tispl.bin_HS"
> > -SPL_BINARYNAME = "tispl.bin"
> > -UBOOT_BINARY = "u-boot.img_HS"
> > -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
> > +UBOOT_IMAGE = "u-boot.img_HS"
> >
> > TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
> > --
> > 2.36.1
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition
2022-06-06 14:26 ` Manorit Chawdhry
@ 2022-06-06 14:27 ` Andrew Davis
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Davis @ 2022-06-06 14:27 UTC (permalink / raw)
To: Manorit Chawdhry, Denys Dmytriyenko; +Cc: Ryan Eatmon, meta-ti
On 6/6/22 9:26 AM, Manorit Chawdhry wrote:
> On 17:01-20220603, Denys Dmytriyenko wrote:
>> On Thu, Jun 02, 2022 at 03:24:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>>> From: Manorit Chawdhry <m-chawdhry@ti.com>
>>>
>>> IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to
>>> incomplete binaries in /boot and the naming of the binaries were not
>>> correct.
>>>
>>> Fixes /boot partition for HS devices.
>>>
>>> Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
>>> [afd: Extended fix to all HS platforms]
>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>
>> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
>>
>>
>
> Hi,
>
> Running this patch on j721e-hsevm seems to break the secure boot mechanism on
> u-boot stage. Will need fixes.
>
Thanks for testing, will fix and send v2.
Thanks,
Andrew
> Regards,
> Manorit
>
>>> ---
>>> conf/machine/am64xx-hs-evm.conf | 4 +---
>>> conf/machine/am65xx-hs-evm.conf | 4 +---
>>> conf/machine/include/k3.inc | 5 +++--
>>> conf/machine/j7-hs-evm.conf | 4 +---
>>> conf/machine/j7200-hs-evm.conf | 4 +---
>>> 5 files changed, 7 insertions(+), 14 deletions(-)
>>>
>>> diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
>>> index 44e81463..c0d904e1 100644
>>> --- a/conf/machine/am64xx-hs-evm.conf
>>> +++ b/conf/machine/am64xx-hs-evm.conf
>>> @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
>>> UBOOT_DTBO_OFFSET = "0x00010000"
>>>
>>> SPL_BINARY = "tispl.bin_HS"
>>> -SPL_BINARYNAME = "tispl.bin"
>>> -UBOOT_BINARY = "u-boot.img_HS"
>>> -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
>>> +UBOOT_IMAGE = "u-boot.img_HS"
>>>
>>> TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
>>> diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
>>> index e4eebb6a..a7514663 100644
>>> --- a/conf/machine/am65xx-hs-evm.conf
>>> +++ b/conf/machine/am65xx-hs-evm.conf
>>> @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
>>> UBOOT_DTBO_OFFSET = "0x00010000"
>>>
>>> SPL_BINARY = "tispl.bin_HS"
>>> -SPL_BINARYNAME = "tispl.bin"
>>> -UBOOT_BINARY = "u-boot.img_HS"
>>> -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
>>> +UBOOT_IMAGE = "u-boot.img_HS"
>>>
>>> TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
>>> diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
>>> index e0970698..f85e6b98 100644
>>> --- a/conf/machine/include/k3.inc
>>> +++ b/conf/machine/include/k3.inc
>>> @@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
>>> UBOOT_LOADADDRESS = "0x80008000"
>>>
>>> SPL_BINARY = "tispl.bin"
>>> +SPL_BINARYNAME = "tispl.bin"
>>> UBOOT_SUFFIX = "img"
>>>
>>> EXTRA_IMAGEDEPENDS += "virtual/bootloader"
>>> @@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
>>>
>>> IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
>>>
>>> -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
>>> -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
>>> +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
>>> +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
>>>
>>> IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
>>>
>>> diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
>>> index f2e3ccf5..629a5ccd 100644
>>> --- a/conf/machine/j7-hs-evm.conf
>>> +++ b/conf/machine/j7-hs-evm.conf
>>> @@ -15,9 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
>>> UBOOT_DTBO_OFFSET = "0x00010000"
>>>
>>> SPL_BINARY = "tispl.bin_HS"
>>> -SPL_BINARYNAME = "tispl.bin"
>>> -UBOOT_BINARY = "u-boot.img_HS"
>>> -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
>>> +UBOOT_IMAGE = "u-boot.img_HS"
>>>
>>> BBMULTICONFIG += "k3r5-sr1-1"
>>>
>>> diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
>>> index a5bd637e..54b7906f 100644
>>> --- a/conf/machine/j7200-hs-evm.conf
>>> +++ b/conf/machine/j7200-hs-evm.conf
>>> @@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
>>> UBOOT_DTBO_OFFSET = "0x00010000"
>>>
>>> SPL_BINARY = "tispl.bin_HS"
>>> -SPL_BINARYNAME = "tispl.bin"
>>> -UBOOT_BINARY = "u-boot.img_HS"
>>> -IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
>>> +UBOOT_IMAGE = "u-boot.img_HS"
>>>
>>> TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
>>> --
>>> 2.36.1
>>>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-06-06 14:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-02 20:24 [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition Andrew Davis
2022-06-02 20:24 ` [meta-ti][dunfell][PATCH 2/2] conf: machine: Make multi-certificate image the default Andrew Davis
2022-06-03 21:02 ` Denys Dmytriyenko
2022-06-03 21:01 ` [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition Denys Dmytriyenko
2022-06-06 14:26 ` Manorit Chawdhry
2022-06-06 14:27 ` Andrew Davis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.