From patchwork Thu Mar 30 21:24:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 21972 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13C34C77B61 for ; Thu, 30 Mar 2023 21:24:44 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.39256.1680211482948960202 for ; Thu, 30 Mar 2023 14:24:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=ovpl2pBK; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: reatmon@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32ULOeeY090593; Thu, 30 Mar 2023 16:24:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680211480; bh=q2Oe0ureY2oqgEj7EHZl2Xp+uDPZjkqFqRfDW2SG+dc=; h=From:To:Subject:Date:In-Reply-To:References; b=ovpl2pBKFA/zmak0tx0UatSSoV5ZJkamyJnGoLbOS2uI1zbjEz5A85kvDZc7qsCfs BxtL0d/efqE05yTmDc5/+qE7MplK+otD3Caybs0VqxiMtuz9gf1VOHsvwOsCKkN7Fy tK6Fq+tOCxVzBUo1nYTbQT5QOaipY5ZcnqF9tGyc= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32ULOej4019255 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Mar 2023 16:24:40 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 30 Mar 2023 16:24:40 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 30 Mar 2023 16:24:40 -0500 Received: from uda0214219 (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32ULOexS081103; Thu, 30 Mar 2023 16:24:40 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1phzlA-00054J-91; Thu, 30 Mar 2023 16:24:40 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [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 16:24:37 -0500 Message-ID: <20230330212440.19437-2-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230330212440.19437-1-reatmon@ti.com> References: <20230330212440.19437-1-reatmon@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 30 Mar 2023 21:24:44 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16259 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. Signed-off-by: Ryan Eatmon Acked-by: Denys Dmytriyenko --- ...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 +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 +--- + 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" +