From: Andrew Davis <afd@ti.com>
To: Denys Dmytriyenko <denys@konsulko.com>,
Ryan Eatmon <reatmon@ti.com>, Praneeth Bajjuri <praneeth@ti.com>,
Neha Malcom Francis <n-francis@ti.com>,
<meta-ti@lists.yoctoproject.org>
Cc: Andrew Davis <afd@ti.com>
Subject: [meta-ti][master/kirkstone][RFC 5/9] u-boot-ti-staging: Remove version 2021.01
Date: Tue, 25 Apr 2023 12:23:41 -0500 [thread overview]
Message-ID: <20230425172345.12293-6-afd@ti.com> (raw)
In-Reply-To: <20230425172345.12293-1-afd@ti.com>
This will no longer build after we switch away from k3-image-gen. Remove
this version and make 2023.04 the default.
Signed-off-by: Andrew Davis <afd@ti.com>
---
...e-to-support-oe-core-fitImage-naming.patch | 144 ------------------
.../u-boot/u-boot-ti-staging_2021.01.bb | 15 --
.../u-boot/u-boot-ti-staging_2023.04.bb | 2 -
3 files changed, 161 deletions(-)
delete 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
delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
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
deleted file mode 100644
index 9a832312..00000000
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-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
deleted file mode 100644
index 7529ce6c..00000000
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
-
-require u-boot-ti.inc
-
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
-
-PR = "r34"
-
-BRANCH = "ti-u-boot-2021.01"
-
-SRCREV = "2ee8efd6543648c6b8a14d93d52a6038854035c8"
-
-SRC_URI += "file://0001-configs-Update-to-support-oe-core-fitImage-naming.patch"
-
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
index 6a46e812..c7006717 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
@@ -7,5 +7,3 @@ PR = "r0"
BRANCH = "ti-u-boot-2023.04"
SRCREV = "41a88ad529b3943b1e465846eb24fe2c29203e35"
-
-DEFAULT_PREFERENCE = "-1"
--
2.39.2
next prev parent reply other threads:[~2023-04-25 17:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-25 17:23 [meta-ti][master/kirkstone][RFC 0/9] Switch to U-Boot binman Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 1/9] ti-dm-fw: Add recipe for TI DM firmware Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 2/9] ti-eth-fw: Add recipe for TI Ethernet firmware Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 3/9] ti-sci-fw: Remove source package recipe Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 4/9] u-boot-bb.org: Remove this recipe Andrew Davis
2023-04-27 20:31 ` Denys Dmytriyenko
2023-04-28 15:13 ` Andrew Davis
2023-05-02 19:38 ` Denys Dmytriyenko
2023-05-04 14:00 ` Andrew Davis
2023-05-06 1:42 ` Denys Dmytriyenko
2023-04-25 17:23 ` Andrew Davis [this message]
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 6/9] ti-sci-fw: Drop k3-image-gen and only provide firmware Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 7/9] u-boot-ti-staging: Use binman to package our firmware Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 8/9] conf: machine: Switch all the machines over to U-Boot binman Andrew Davis
2023-04-25 17:23 ` [meta-ti][master/kirkstone][RFC 9/9] conf: machine: Remove all leftover config files 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=20230425172345.12293-6-afd@ti.com \
--to=afd@ti.com \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=n-francis@ti.com \
--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.