[dunfell/master][PATCH 0/7] conf/machine: k3: cleanup wic files

[dunfell/master][PATCH 0/7] conf/machine: k3: cleanup wic files

[Nishanth Menon]

Hi,

lets help cleanup the wic files generated for K3 platforms. This
includes setting up a reusable boot image pattern that we can use, also
generates the bmap file that bmaptool can use and while at it finally
generate bootable images for j7200 and am64 which depend on
multi-certificate images for boot.

Nishanth Menon (7):
  conf/machine: k3: Add multi-certificate boot image support
  conf/machine: am65xx: Document boot images as legacy mode
  conf/machine: j7: Document boot images as legacy mode
  conf/machine: j7200-evm: Switch to multi-certificate boot images
  conf/machine: am64xx: Consolidate image configuration to SoC include
  conf/machine: am64xx: Switch to multi-certificate boot images
  conf/machine: k3: Lets build bmap files by default

 conf/machine/am64xx-evm.conf    | 8 --------
 conf/machine/am64xx-sk.conf     | 8 --------
 conf/machine/include/am64xx.inc | 7 +++++++
 conf/machine/include/am65xx.inc | 1 +
 conf/machine/include/j7.inc     | 2 ++
 conf/machine/include/k3.inc     | 8 ++++++--
 conf/machine/j7200-evm.conf     | 3 ++-
 7 files changed, 18 insertions(+), 19 deletions(-)

-- 
2.31.0

[dunfell/master][PATCH 1/7] conf/machine: k3: Add multi-certificate boot image support

[Nishanth Menon]

Lets keep things consistent by providing two possibilities for platforms
to pick from - legacy boot and multi-certificate boot.

In legacy boot, the base bootloader and system firmware are
maintained as separate binaries (tiboot3.bin and sysfw.itb).

In multi-certificate boot that newer K3 devices support, ROM is smarter
and can handle multiple x509 certificate based images: so we can strip
out the sysfw.itb and integrate it as part of tiboot3.bin itself. This
improves authentication and overall system boot times since we are now
able to boot both the system controller and the boot processor in
parallel.

We do have a scheme currently to identify the images necessary for boot
etc, but things are handled on a platform conf file basis. We can
improve that by introducing the pattern at the top level include and use
the relevant pattern in platforms as needed.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 conf/machine/include/k3.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index c727d724ac28..56ad40c3f963 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -40,7 +40,11 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
 
 IMAGE_FSTYPES += "tar.xz wic.xz"
 
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
+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 ?= "${IMAGE_BOOT_FILES_LEGACY}"
+
 WKS_FILE ?= "sdimage-2part.wks"
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
 do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-- 
2.31.0

Re: [dunfell/master][PATCH 1/7] conf/machine: k3: Add multi-certificate boot image support

[Denys Dmytriyenko]

On Wed, Mar 31, 2021 at 11:51:27AM -0500, Nishanth Menon wrote:
> Lets keep things consistent by providing two possibilities for platforms
> to pick from - legacy boot and multi-certificate boot.
> 
> In legacy boot, the base bootloader and system firmware are
> maintained as separate binaries (tiboot3.bin and sysfw.itb).
> 
> In multi-certificate boot that newer K3 devices support, ROM is smarter
> and can handle multiple x509 certificate based images: so we can strip
> out the sysfw.itb and integrate it as part of tiboot3.bin itself. This
> improves authentication and overall system boot times since we are now
> able to boot both the system controller and the boot processor in
> parallel.
> 
> We do have a scheme currently to identify the images necessary for boot
> etc, but things are handled on a platform conf file basis. We can
> improve that by introducing the pattern at the top level include and use
> the relevant pattern in platforms as needed.

Thanks for detailed explanation of K3 boot modes!


> Signed-off-by: Nishanth Menon <nm@ti.com>

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
>  conf/machine/include/k3.inc | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
> index c727d724ac28..56ad40c3f963 100644
> --- a/conf/machine/include/k3.inc
> +++ b/conf/machine/include/k3.inc
> @@ -40,7 +40,11 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
>  
>  IMAGE_FSTYPES += "tar.xz wic.xz"
>  
> -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
> +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 ?= "${IMAGE_BOOT_FILES_LEGACY}"
> +
>  WKS_FILE ?= "sdimage-2part.wks"
>  do_image_wic[depends] += "virtual/bootloader:do_deploy"
>  do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
> -- 
> 2.31.0
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

[dunfell/master][PATCH 2/7] conf/machine: am65xx: Document boot images as legacy mode

[Nishanth Menon]

We use the default IMAGE_BOOT_FILES configuration which matches up with
legacy boot configuration. Document the same to allow folks to
understand by just looking at the SoC include file.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 conf/machine/include/am65xx.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
index 684fea45b6d7..bb5911f7b041 100644
--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -23,6 +23,7 @@ KERNEL_DEVICETREE = " \
 
 BBMULTICONFIG += "k3r5-sr2"
 
+# Use default IMAGE_BOOT_FILES_LEGACY files
 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"
-- 
2.31.0

Re: [dunfell/master][PATCH 2/7] conf/machine: am65xx: Document boot images as legacy mode

[Denys Dmytriyenko]

On Wed, Mar 31, 2021 at 11:51:28AM -0500, Nishanth Menon wrote:
> We use the default IMAGE_BOOT_FILES configuration which matches up with
> legacy boot configuration. Document the same to allow folks to
> understand by just looking at the SoC include file.

May want to add one extra comment below.


> Signed-off-by: Nishanth Menon <nm@ti.com>

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
>  conf/machine/include/am65xx.inc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
> index 684fea45b6d7..bb5911f7b041 100644
> --- a/conf/machine/include/am65xx.inc
> +++ b/conf/machine/include/am65xx.inc
> @@ -23,6 +23,7 @@ KERNEL_DEVICETREE = " \
>  
>  BBMULTICONFIG += "k3r5-sr2"
>  
> +# Use default IMAGE_BOOT_FILES_LEGACY files

+# 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"
> -- 
> 2.31.0
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [dunfell/master][PATCH 2/7] conf/machine: am65xx: Document boot images as legacy mode

[Nishanth Menon]

On 18:23-20210331, Denys Dmytriyenko wrote:
> On Wed, Mar 31, 2021 at 11:51:28AM -0500, Nishanth Menon wrote:
> > We use the default IMAGE_BOOT_FILES configuration which matches up with
> > legacy boot configuration. Document the same to allow folks to
> > understand by just looking at the SoC include file.
> 
> May want to add one extra comment below.


Updated in the upcoming V2 of this series.

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

[dunfell/master][PATCH 3/7] conf/machine: j7: Document boot images as legacy mode

[Nishanth Menon]

We use the default IMAGE_BOOT_FILES configuration which matches up with
legacy boot configuration. Document the same to allow folks to
understand by just looking at the SoC include file.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 conf/machine/include/j7.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
index c187f299f470..d3eda1a828aa 100644
--- a/conf/machine/include/j7.inc
+++ b/conf/machine/include/j7.inc
@@ -4,6 +4,8 @@ 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"
-- 
2.31.0

Re: [dunfell/master][PATCH 3/7] conf/machine: j7: Document boot images as legacy mode

[Denys Dmytriyenko]

On Wed, Mar 31, 2021 at 11:51:29AM -0500, Nishanth Menon wrote:
> We use the default IMAGE_BOOT_FILES configuration which matches up with
> legacy boot configuration. Document the same to allow folks to
> understand by just looking at the SoC include file.
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
>  conf/machine/include/j7.inc | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
> index c187f299f470..d3eda1a828aa 100644
> --- a/conf/machine/include/j7.inc
> +++ b/conf/machine/include/j7.inc
> @@ -4,6 +4,8 @@ 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"
> -- 
> 2.31.0
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

[dunfell/master][PATCH 4/7] conf/machine: j7200-evm: Switch to multi-certificate boot images

[Nishanth Menon]

Switch to using all of multi-certificate boot images. This allows us
to create bootable images - in this case, we are missing tiboot3.bin

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 conf/machine/j7200-evm.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
index dab6d8cb0cd8..b2079218d9fa 100644
--- a/conf/machine/j7200-evm.conf
+++ b/conf/machine/j7200-evm.conf
@@ -14,7 +14,8 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j7200_evm_a72_config"
 
-IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
+# J7200 supports multi-certificate images, use the same
+IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
 
 do_image_wic[depends] += "trusted-firmware-a:do_deploy"
 do_image_tar[depends] += "trusted-firmware-a:do_deploy"
-- 
2.31.0

Re: [dunfell/master][PATCH 4/7] conf/machine: j7200-evm: Switch to multi-certificate boot images

[Denys Dmytriyenko]

On Wed, Mar 31, 2021 at 11:51:30AM -0500, Nishanth Menon wrote:
> Switch to using all of multi-certificate boot images. This allows us
> to create bootable images - in this case, we are missing tiboot3.bin
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
>  conf/machine/j7200-evm.conf | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf
> index dab6d8cb0cd8..b2079218d9fa 100644
> --- a/conf/machine/j7200-evm.conf
> +++ b/conf/machine/j7200-evm.conf
> @@ -14,7 +14,8 @@ KERNEL_DEVICETREE = " \
>  
>  UBOOT_MACHINE = "j7200_evm_a72_config"
>  
> -IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
> +# J7200 supports multi-certificate images, use the same
> +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
>  
>  do_image_wic[depends] += "trusted-firmware-a:do_deploy"
>  do_image_tar[depends] += "trusted-firmware-a:do_deploy"

I don't believe these lines are needed here, as TF-A images are not packaged 
into wic, but SPL, and that dependency is already handled by U-boot recipe.


> -- 
> 2.31.0
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

[dunfell/master][PATCH 5/7] conf/machine: am64xx: Consolidate image configuration to SoC include

[Nishanth Menon]

IMAGE type and dependencies can easily be centralized to SoC include
file. This is necessary to make sure that we don't do the duplication
and having multiple places to fix up.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 conf/machine/am64xx-evm.conf    | 8 --------
 conf/machine/am64xx-sk.conf     | 8 --------
 conf/machine/include/am64xx.inc | 6 ++++++
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
index eda310a32b14..c6ba2a8735f3 100644
--- a/conf/machine/am64xx-evm.conf
+++ b/conf/machine/am64xx-evm.conf
@@ -4,12 +4,4 @@
 
 require conf/machine/include/am64xx.inc
 
-IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
-
 UBOOT_MACHINE = "am64x_evm_a53_defconfig"
-
-do_image_wic[depends] += "trusted-firmware-a:do_deploy"
-do_image_tar[depends] += "trusted-firmware-a:do_deploy"
-
-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/am64xx-sk.conf b/conf/machine/am64xx-sk.conf
index 4cad8adcf1df..445ff72339d9 100644
--- a/conf/machine/am64xx-sk.conf
+++ b/conf/machine/am64xx-sk.conf
@@ -4,16 +4,8 @@
 
 require conf/machine/include/am64xx.inc
 
-IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
-
 UBOOT_MACHINE = "am64x_sk_a53_defconfig"
 
-do_image_wic[depends] += "trusted-firmware-a:do_deploy"
-do_image_tar[depends] += "trusted-firmware-a:do_deploy"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
 KERNEL_DEVICETREE = " \
     ti/k3-am642-sk.dtb \
 "
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
index 20441d8a757f..3173319df354 100644
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -10,6 +10,12 @@ KERNEL_DEVICETREE = " \
     ti/k3-am642-evm.dtb \
 "
 
+IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
+do_image_wic[depends] += "trusted-firmware-a:do_deploy"
+do_image_tar[depends] += "trusted-firmware-a:do_deploy"
+do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
+
 TFA_BOARD = "lite"
 OPTEEMACHINE = "k3-am65x"
 OPTEEOUTPUTMACHINE = "k3"
-- 
2.31.0

Re: [dunfell/master][PATCH 5/7] conf/machine: am64xx: Consolidate image configuration to SoC include

[Denys Dmytriyenko]

On Wed, Mar 31, 2021 at 11:51:31AM -0500, Nishanth Menon wrote:
> IMAGE type and dependencies can easily be centralized to SoC include
> file. This is necessary to make sure that we don't do the duplication
> and having multiple places to fix up.

I thought the plan was to soon merge am64xx-sk into am64xx-evm. But 
regardless, having these vars set for the entire SoC family is best.


> Signed-off-by: Nishanth Menon <nm@ti.com>

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
>  conf/machine/am64xx-evm.conf    | 8 --------
>  conf/machine/am64xx-sk.conf     | 8 --------
>  conf/machine/include/am64xx.inc | 6 ++++++
>  3 files changed, 6 insertions(+), 16 deletions(-)
> 
> diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
> index eda310a32b14..c6ba2a8735f3 100644
> --- a/conf/machine/am64xx-evm.conf
> +++ b/conf/machine/am64xx-evm.conf
> @@ -4,12 +4,4 @@
>  
>  require conf/machine/include/am64xx.inc
>  
> -IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
> -
>  UBOOT_MACHINE = "am64x_evm_a53_defconfig"
> -
> -do_image_wic[depends] += "trusted-firmware-a:do_deploy"
> -do_image_tar[depends] += "trusted-firmware-a:do_deploy"
> -
> -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/am64xx-sk.conf b/conf/machine/am64xx-sk.conf
> index 4cad8adcf1df..445ff72339d9 100644
> --- a/conf/machine/am64xx-sk.conf
> +++ b/conf/machine/am64xx-sk.conf
> @@ -4,16 +4,8 @@
>  
>  require conf/machine/include/am64xx.inc
>  
> -IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
> -
>  UBOOT_MACHINE = "am64x_sk_a53_defconfig"
>  
> -do_image_wic[depends] += "trusted-firmware-a:do_deploy"
> -do_image_tar[depends] += "trusted-firmware-a:do_deploy"
> -
> -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> -
>  KERNEL_DEVICETREE = " \
>      ti/k3-am642-sk.dtb \
>  "
> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
> index 20441d8a757f..3173319df354 100644
> --- a/conf/machine/include/am64xx.inc
> +++ b/conf/machine/include/am64xx.inc
> @@ -10,6 +10,12 @@ KERNEL_DEVICETREE = " \
>      ti/k3-am642-evm.dtb \
>  "
>  
> +IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
> +do_image_wic[depends] += "trusted-firmware-a:do_deploy"
> +do_image_tar[depends] += "trusted-firmware-a:do_deploy"
> +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> +
>  TFA_BOARD = "lite"
>  OPTEEMACHINE = "k3-am65x"
>  OPTEEOUTPUTMACHINE = "k3"
> -- 
> 2.31.0
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [dunfell/master][PATCH 5/7] conf/machine: am64xx: Consolidate image configuration to SoC include

[Nishanth Menon]

On 18:33-20210331, Denys Dmytriyenko wrote:
> On Wed, Mar 31, 2021 at 11:51:31AM -0500, Nishanth Menon wrote:
> > IMAGE type and dependencies can easily be centralized to SoC include
> > file. This is necessary to make sure that we don't do the duplication
> > and having multiple places to fix up.
> 
> I thought the plan was to soon merge am64xx-sk into am64xx-evm. But 
> regardless, having these vars set for the entire SoC family is best.
> 

yup. the merge of sk and evm is still TBD - I have heard of it
internally, though was'nt clear as to how it will be done since the
DDR is so different.. hopefully in some follow on series, I suppose..

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

[dunfell/master][PATCH 6/7] conf/machine: am64xx: Switch to multi-certificate boot images

[Nishanth Menon]

Switch to using all of multi-certificate boot images. This allows us
to create bootable images - in this case, we are missing tiboot3.bin

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 conf/machine/include/am64xx.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
index 3173319df354..9d40b066a03a 100644
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -10,7 +10,8 @@ KERNEL_DEVICETREE = " \
     ti/k3-am642-evm.dtb \
 "
 
-IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
+# AM64 supports multi-certificate images, use the same
+IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
 do_image_wic[depends] += "trusted-firmware-a:do_deploy"
 do_image_tar[depends] += "trusted-firmware-a:do_deploy"
 do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-- 
2.31.0

Re: [dunfell/master][PATCH 6/7] conf/machine: am64xx: Switch to multi-certificate boot images

[Denys Dmytriyenko]

On Wed, Mar 31, 2021 at 11:51:32AM -0500, Nishanth Menon wrote:
> Switch to using all of multi-certificate boot images. This allows us
> to create bootable images - in this case, we are missing tiboot3.bin
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
>  conf/machine/include/am64xx.inc | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
> index 3173319df354..9d40b066a03a 100644
> --- a/conf/machine/include/am64xx.inc
> +++ b/conf/machine/include/am64xx.inc
> @@ -10,7 +10,8 @@ KERNEL_DEVICETREE = " \
>      ti/k3-am642-evm.dtb \
>  "
>  
> -IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
> +# AM64 supports multi-certificate images, use the same
> +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
>  do_image_wic[depends] += "trusted-firmware-a:do_deploy"
>  do_image_tar[depends] += "trusted-firmware-a:do_deploy"

Same comment - TF-A is not needed here.


>  do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> -- 
> 2.31.0
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [meta-ti] [dunfell/master][PATCH 6/7] conf/machine: am64xx: Switch to multi-certificate boot images

[Denys Dmytriyenko]

On Wed, Mar 31, 2021 at 06:35:00PM -0400, Denys Dmytriyenko wrote:
> On Wed, Mar 31, 2021 at 11:51:32AM -0500, Nishanth Menon wrote:
> > Switch to using all of multi-certificate boot images. This allows us
> > to create bootable images - in this case, we are missing tiboot3.bin
> > 
> > Signed-off-by: Nishanth Menon <nm@ti.com>
> > ---
> >  conf/machine/include/am64xx.inc | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
> > index 3173319df354..9d40b066a03a 100644
> > --- a/conf/machine/include/am64xx.inc
> > +++ b/conf/machine/include/am64xx.inc
> > @@ -10,7 +10,8 @@ KERNEL_DEVICETREE = " \
> >      ti/k3-am642-evm.dtb \
> >  "
> >  
> > -IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
> > +# AM64 supports multi-certificate images, use the same
> > +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
> >  do_image_wic[depends] += "trusted-firmware-a:do_deploy"
> >  do_image_tar[depends] += "trusted-firmware-a:do_deploy"
> 
> Same comment - TF-A is not needed here.

I guess this can be cleaned up separately. The main change is fine:

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> >  do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> > -- 
> > 2.31.0

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [meta-ti] [dunfell/master][PATCH 6/7] conf/machine: am64xx: Switch to multi-certificate boot images

[Nishanth Menon]

On 18:35-20210331, Denys Dmytriyenko wrote:
> On Wed, Mar 31, 2021 at 06:35:00PM -0400, Denys Dmytriyenko wrote:
> > On Wed, Mar 31, 2021 at 11:51:32AM -0500, Nishanth Menon wrote:
> > > Switch to using all of multi-certificate boot images. This allows us
> > > to create bootable images - in this case, we are missing tiboot3.bin
> > > 
> > > Signed-off-by: Nishanth Menon <nm@ti.com>
> > > ---
> > >  conf/machine/include/am64xx.inc | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
> > > index 3173319df354..9d40b066a03a 100644
> > > --- a/conf/machine/include/am64xx.inc
> > > +++ b/conf/machine/include/am64xx.inc
> > > @@ -10,7 +10,8 @@ KERNEL_DEVICETREE = " \
> > >      ti/k3-am642-evm.dtb \
> > >  "
> > >  
> > > -IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
> > > +# AM64 supports multi-certificate images, use the same
> > > +IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
> > >  do_image_wic[depends] += "trusted-firmware-a:do_deploy"
> > >  do_image_tar[depends] += "trusted-firmware-a:do_deploy"
> > 
> > Same comment - TF-A is not needed here.
> 
> I guess this can be cleaned up separately. The main change is fine:

Done in the upcoming V2.
> 
> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
> 
> 
> > >  do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
> > > -- 
> > > 2.31.0
> 
> -- 
> Regards,
> Denys Dmytriyenko <denis@denix.org>
> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
> Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

[dunfell/master][PATCH 7/7] conf/machine: k3: Lets build bmap files by default

[Nishanth Menon]

Lets generate bmap files for bmaptool to use as well as default to use
with wic files.

https://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#flashing-images-using-bmaptool

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 conf/machine/include/k3.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index 56ad40c3f963..e0970698b33d 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -38,7 +38,7 @@ UBI_VOLNAME = "rootfs"
 # List common SoC features, may need to add touchscreen for specific machines
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
 
-IMAGE_FSTYPES += "tar.xz wic.xz"
+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"
-- 
2.31.0

Re: [dunfell/master][PATCH 7/7] conf/machine: k3: Lets build bmap files by default

[Denys Dmytriyenko]

On Wed, Mar 31, 2021 at 11:51:33AM -0500, Nishanth Menon wrote:
> Lets generate bmap files for bmaptool to use as well as default to use
> with wic files.
> 
> https://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#flashing-images-using-bmaptool

Thank you! I've been enjoying bmap a lot lately - can speed up SD card 
flashing 2x-3x by skipping empty blocks of the image. And was going to 
submit the same change, but you beat me to it... :)


> Signed-off-by: Nishanth Menon <nm@ti.com>

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
>  conf/machine/include/k3.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
> index 56ad40c3f963..e0970698b33d 100644
> --- a/conf/machine/include/k3.inc
> +++ b/conf/machine/include/k3.inc
> @@ -38,7 +38,7 @@ UBI_VOLNAME = "rootfs"
>  # List common SoC features, may need to add touchscreen for specific machines
>  MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
>  
> -IMAGE_FSTYPES += "tar.xz wic.xz"
> +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"
> -- 
> 2.31.0
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964