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 <[email protected]> --- .../recipes-bsp/u-boot/u-boot-ti-mainline_git.bb | 4 ++-- .../recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb | 10 ---------- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 10 ++++++++++ 3 files changed, 12 insertions(+), 12 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 e98d584a..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.07" +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.07" # 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 = "83cdab8b2c6ea0fc0860f8444d083353b47f1d5c" +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.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 7e2e2011..493c1c31 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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17415): https://lists.yoctoproject.org/g/meta-ti/message/17415 Mute This Topic: https://lists.yoctoproject.org/mt/103938097/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
