From: Denys Dmytriyenko <denis@denix.org>
To: afd@ti.com
Cc: Ryan Eatmon <reatmon@ti.com>,
Manorit Chawdhry <m-chawdhry@ti.com>,
meta-ti@lists.yoctoproject.org
Subject: Re: [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition
Date: Fri, 3 Jun 2022 17:01:58 -0400 [thread overview]
Message-ID: <20220603210158.GN9834@denix.org> (raw)
In-Reply-To: <20220602202448.18068-1-afd@ti.com>
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
>
next prev parent reply other threads:[~2022-06-03 21:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Denys Dmytriyenko [this message]
2022-06-06 14:26 ` [meta-ti][dunfell][PATCH 1/2] conf: machine: wic: Fix HS image boot partition Manorit Chawdhry
2022-06-06 14:27 ` Andrew Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220603210158.GN9834@denix.org \
--to=denis@denix.org \
--cc=afd@ti.com \
--cc=m-chawdhry@ti.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=reatmon@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.