From: Denys Dmytriyenko <denis@denix.org>
To: reatmon@ti.com
Cc: Praneeth Bajjuri <praneeth@ti.com>,
Denys Dmytriyenko <denys@konsulko.com>,
meta-ti@lists.yoctoproject.org
Subject: Re: [meta-ti][master/kirkstone][PATCH 1/4] u-boot-ti-staging: Fix u-boot configs to match oe-core fitImage
Date: Thu, 30 Mar 2023 20:04:08 -0400 [thread overview]
Message-ID: <20230331000408.GA18050@denix.org> (raw)
In-Reply-To: <20230330212440.19437-2-reatmon@ti.com>
On Thu, Mar 30, 2023 at 04:24:37PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> After moving to the oe-core kernel-fitimage.bbclass we found that the
> dtb names we were searching for did not match. This was due to the
> KERNEL_DEVICETREE entries including the vendor subdir in the section
> names of the fitImage file. This patch updates support in 2021 so that
> we can temporarily get to a stable boot point before starting our LTS
> migration and changing a lot of things in the recipes.
I'm assuming this will be merged to 2023.04 and this patch won't be needed in
meta-ti then?
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Acked-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> ...e-to-support-oe-core-fitImage-naming.patch | 144 ++++++++++++++++++
> .../u-boot/u-boot-ti-staging_2021.01.bb | 8 +-
> 2 files changed, 151 insertions(+), 1 deletion(-)
> create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch
>
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch
> new file mode 100644
> index 00000000..9a832312
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch
> @@ -0,0 +1,144 @@
> +From 33c4b7335a39c48507a254505169df59c7a69c75 Mon Sep 17 00:00:00 2001
> +From: Ryan Eatmon <reatmon@ti.com>
> +Date: Thu, 23 Mar 2023 10:29:40 -0500
> +Subject: [PATCH] configs: Update to support oe-core fitImage naming
> +
> +In kirkstone and forward, the values in the fitImage have been
> +standardized to include both conf- and the vender subdir in the name of
> +the dtbs. This patch updates u-boot to support that.
> +
> +Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> +---
> + include/configs/am62x_evm.h | 6 +++---
> + include/configs/am64x_evm.h | 4 ++--
> + include/configs/am65x_evm.h | 2 +-
> + include/configs/j721e_evm.h | 8 ++++----
> + include/configs/j721s2_evm.h | 6 +++---
> + include/configs/j784s4_evm.h | 6 +++---
> + include/configs/ti_armv7_common.h | 2 +-
> + 7 files changed, 17 insertions(+), 17 deletions(-)
> +
> +diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h
> +index 97bd7c1fd7..6d957c906b 100644
> +--- a/include/configs/am62x_evm.h
> ++++ b/include/configs/am62x_evm.h
> +@@ -122,11 +122,11 @@
> + #define EXTRA_ENV_AM625_BOARD_SETTINGS \
> + "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> + "findfdt=" \
> +- "setenv name_fdt ${default_device_tree};" \
> ++ "setenv name_fdt ti_${default_device_tree};" \
> + "if test $board_name = am62x_skevm; then " \
> +- "setenv name_fdt k3-am625-sk.dtb; fi;" \
> ++ "setenv name_fdt ti_k3-am625-sk.dtb; fi;" \
> + "if test $board_name = am62x_lp_skevm; then " \
> +- "setenv name_fdt k3-am62x-lp-sk.dtb; fi;" \
> ++ "setenv name_fdt ti_k3-am62x-lp-sk.dtb; fi;" \
> + "setenv fdtfile ${name_fdt}\0" \
> + "name_kern=Image\0" \
> + "console=ttyS2,115200n8\0" \
> +diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h
> +index 33ba5da31f..d32b488b58 100644
> +--- a/include/configs/am64x_evm.h
> ++++ b/include/configs/am64x_evm.h
> +@@ -107,9 +107,9 @@
> + #define EXTRA_ENV_AM642_BOARD_SETTINGS \
> + "findfdt=" \
> + "if test $board_name = am64x_gpevm; then " \
> +- "setenv fdtfile k3-am642-evm.dtb; fi; " \
> ++ "setenv fdtfile ti_k3-am642-evm.dtb; fi; " \
> + "if test $board_name = am64x_skevm; then " \
> +- "setenv fdtfile k3-am642-sk.dtb; fi;" \
> ++ "setenv fdtfile ti_k3-am642-sk.dtb; fi;" \
> + "if test $fdtfile = undefined; then " \
> + "echo WARNING: Could not determine device tree to use; fi; \0" \
> + "name_kern=Image\0" \
> +diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
> +index c78e4c4493..07d234d5d3 100644
> +--- a/include/configs/am65x_evm.h
> ++++ b/include/configs/am65x_evm.h
> +@@ -64,7 +64,7 @@
> + /* U-Boot general configuration */
> + #define EXTRA_ENV_AM65X_BOARD_SETTINGS \
> + "findfdt=" \
> +- "setenv name_fdt k3-am654-base-board.dtb;" \
> ++ "setenv name_fdt ti_k3-am654-base-board.dtb;" \
> + "setenv fdtfile ${name_fdt}\0" \
> + "name_kern=Image\0" \
> + "console=ttyS2,115200n8\0" \
> +diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
> +index 50b018b6ed..ad11494bd0 100644
> +--- a/include/configs/j721e_evm.h
> ++++ b/include/configs/j721e_evm.h
> +@@ -77,13 +77,13 @@
> + #define EXTRA_ENV_J721E_BOARD_SETTINGS \
> + "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> + "findfdt=" \
> +- "setenv name_fdt ${default_device_tree};" \
> ++ "setenv name_fdt ti_${default_device_tree};" \
> + "if test $board_name = J721EX-PM1-SOM; then " \
> +- "setenv name_fdt k3-j721e-proc-board-tps65917.dtb; fi;" \
> ++ "setenv name_fdt ti_k3-j721e-proc-board-tps65917.dtb; fi;" \
> + "if test $board_name = j721e; then " \
> +- "setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \
> ++ "setenv name_fdt ti_k3-j721e-common-proc-board.dtb; fi;" \
> + "if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \
> +- "setenv name_fdt k3-j721e-sk.dtb; fi;" \
> ++ "setenv name_fdt ti_k3-j721e-sk.dtb; fi;" \
> + "setenv fdtfile ${name_fdt}\0" \
> + "name_kern=Image\0" \
> + "console=ttyS2,115200n8\0" \
> +diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h
> +index 2d26eb544d..4b4d4a6e37 100644
> +--- a/include/configs/j721s2_evm.h
> ++++ b/include/configs/j721s2_evm.h
> +@@ -66,11 +66,11 @@
> + #define EXTRA_ENV_J721S2_BOARD_SETTINGS \
> + "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> + "findfdt=" \
> +- "setenv name_fdt ${default_device_tree};" \
> ++ "setenv name_fdt ti_${default_device_tree};" \
> + "if test $board_name = j721s2; then " \
> +- "setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;" \
> ++ "setenv name_fdt ti_k3-j721s2-common-proc-board.dtb; fi;" \
> + "if test $board_name = am68-sk; then " \
> +- "setenv name_fdt k3-am68-sk-base-board.dtb; fi;"\
> ++ "setenv name_fdt ti_k3-am68-sk-base-board.dtb; fi;"\
> + "setenv fdtfile ${name_fdt}\0" \
> + "name_kern=Image\0" \
> + "console=ttyS2,115200n8\0" \
> +diff --git a/include/configs/j784s4_evm.h b/include/configs/j784s4_evm.h
> +index eb609100b0..30820ea1c6 100644
> +--- a/include/configs/j784s4_evm.h
> ++++ b/include/configs/j784s4_evm.h
> +@@ -67,11 +67,11 @@
> + #define EXTRA_ENV_J784S4_BOARD_SETTINGS \
> + "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> + "findfdt=" \
> +- "setenv name_fdt ${default_device_tree};" \
> ++ "setenv name_fdt ti_${default_device_tree};" \
> + "if test $board_name = am69-sk; then " \
> +- "setenv name_fdt k3-am69-sk.dtb; fi;" \
> ++ "setenv name_fdt ti_k3-am69-sk.dtb; fi;" \
> + "if test $board_name = j784s4; then " \
> +- "setenv name_fdt k3-j784s4-evm.dtb; fi;" \
> ++ "setenv name_fdt ti_k3-j784s4-evm.dtb; fi;" \
> + "setenv fdtfile ${name_fdt}\0" \
> + "name_kern=Image\0" \
> + "console=ttyS2,115200n8\0" \
> +diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
> +index c48c4c2398..29de095729 100644
> +--- a/include/configs/ti_armv7_common.h
> ++++ b/include/configs/ti_armv7_common.h
> +@@ -68,7 +68,7 @@
> + "do;" \
> + "setenv overlaystring ${overlaystring}'#'${overlay};" \
> + "done;\0" \
> +- "run_fit=bootm ${addr_fit}#${fdtfile}${overlaystring}\0" \
> ++ "run_fit=bootm ${addr_fit}#conf-${fdtfile}${overlaystring}\0" \
> +
> + /*
> + * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined,
> +--
> +2.17.1
> +
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
> index 7763d8b1..7529ce6c 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
> @@ -1,9 +1,15 @@
> +
> +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
> +
> require u-boot-ti.inc
>
> LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
>
> -PR = "r33"
> +PR = "r34"
>
> BRANCH = "ti-u-boot-2021.01"
>
> SRCREV = "2ee8efd6543648c6b8a14d93d52a6038854035c8"
> +
> +SRC_URI += "file://0001-configs-Update-to-support-oe-core-fitImage-naming.patch"
> +
> --
> 2.17.1
next prev parent reply other threads:[~2023-03-31 0:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 21:24 [meta-ti][master/kirkstone][PATCH 0/4] Sync up from dunfell Ryan Eatmon
2023-03-30 21:24 ` [meta-ti][master/kirkstone][PATCH 1/4] u-boot-ti-staging: Fix u-boot configs to match oe-core fitImage Ryan Eatmon
2023-03-31 0:04 ` Denys Dmytriyenko [this message]
2023-03-31 14:15 ` Ryan Eatmon
2023-03-30 21:24 ` [meta-ti][master/kirkstone][PATCH 2/4] trusted-firmware-a: Only sign files for platforms that support it Ryan Eatmon
2023-03-31 0:12 ` Denys Dmytriyenko
[not found] ` <1751589DE6D33C0C.27612@lists.yoctoproject.org>
2023-03-31 0:17 ` Denys Dmytriyenko
2023-03-30 21:24 ` [meta-ti][master/kirkstone][PATCH 3/4] optee-os: " Ryan Eatmon
2023-03-30 21:24 ` [meta-ti][master/kirkstone][PATCH 4/4] kernel-fitimage: Add signing of fitImage entries for 5.10 kernel Ryan Eatmon
2023-03-31 0:01 ` Denys Dmytriyenko
[not found] ` <1751580B6CF411F3.12651@lists.yoctoproject.org>
2023-03-31 0:14 ` Denys Dmytriyenko
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=20230331000408.GA18050@denix.org \
--to=denis@denix.org \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=praneeth@ti.com \
--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.