From: Ryan Eatmon <reatmon@ti.com>
To: Praneeth Bajjuri <praneeth@ti.com>,
Denys Dmytriyenko <denys@konsulko.com>,
<meta-ti@lists.yoctoproject.org>
Subject: [meta-ti][master][PATCH] u-boot-ti*: Move mainline to 2024.01 and move logo code
Date: Wed, 24 Jan 2024 12:33:08 -0600 [thread overview]
Message-ID: <20240124183308.3201-2-reatmon@ti.com> (raw)
In-Reply-To: <20240124183308.3201-1-reatmon@ti.com>
Now that 2024.01 is official, the logo that am62xx-evm installs is
available in all versions of the repo that we point to. Move all of
that code out of the .bb files and into the u-boot-ti.inc file.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
.../recipes-bsp/u-boot/u-boot-ti-mainline_git.bb | 4 ++--
.../recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb | 10 ----------
.../recipes-bsp/u-boot/u-boot-ti-staging_2024.01.bb | 10 ----------
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 10 ++++++++++
4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
index 692cf84a..f497054c 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
@@ -2,7 +2,7 @@ require u-boot-ti.inc
PR = "r0"
-PV = "2023.10"
+PV = "2024.01"
# For the un-initiated:
# The actual URL you'd use with a git clone for example would be:
@@ -13,4 +13,4 @@ PV = "2023.10"
# b) and we want git fetcher to use https protocol, hence GIT_PROTOCOL as https
UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"
UBOOT_GIT_PROTOCOL = "https"
-SRCREV = "4459ed60cb1e0562bc5b40405e2b4b9bbf766d57"
+SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e"
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 143bcea8..e95c9c76 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,13 +7,3 @@ PR = "r0"
BRANCH = "ti-u-boot-2023.04"
SRCREV = "a97ca328b3df6abf79c5cc01878290e03131bbba"
-
-do_install:append:am62xx() {
- install -d ${D}/boot
- install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
-}
-
-do_deploy:append:am62xx() {
- install -d ${DEPLOYDIR}
- install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
-}
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.01.bb
index 58900bee..d2a6ccb5 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.01.bb
@@ -9,13 +9,3 @@ PR = "r0"
BRANCH = "ti-u-boot-2024.01"
SRCREV = "2f0282922b2c458eea7f85c500a948a587437b63"
-
-do_install:append:am62xx() {
- install -d ${D}/boot
- install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
-}
-
-do_deploy:append:am62xx() {
- install -d ${DEPLOYDIR}
- install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
-}
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index 3a5d8a7d..9b26596c 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -331,4 +331,14 @@ do_deploy:append () {
rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
}
+do_install:append:am62xx() {
+ install -d ${D}/boot
+ install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
+}
+
+do_deploy:append:am62xx() {
+ install -d ${DEPLOYDIR}
+ install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
+}
+
TOOLCHAIN = "gcc"
--
2.17.1
prev parent reply other threads:[~2024-01-24 18:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-24 18:33 [meta-ti][kirkstone][PATCH] u-boot-ti*: Move mainline to 2024.01 and move logo code Ryan Eatmon
2024-01-24 18:33 ` Ryan Eatmon [this message]
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=20240124183308.3201-2-reatmon@ti.com \
--to=reatmon@ti.com \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=praneeth@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).