From patchwork Fri Sep 15 11:15:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chirag Shilwant X-Patchwork-Id: 30478 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 DEDA1EE645A for ; Fri, 15 Sep 2023 11:15:43 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web10.18084.1694776536045200101 for ; Fri, 15 Sep 2023 04:15:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=JX96cwUP; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: c-shilwant@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 38FBFVIZ037517; Fri, 15 Sep 2023 06:15:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1694776531; bh=ZZVAAjL+UYSaDrahiYqim45l1Gye0KCQODkE7I0pOoI=; h=From:To:CC:Subject:Date; b=JX96cwUP7KNKFFoeXVSPL6bftrEceqL99vvk386oEi5VOkMFgNfFgP4Zl53Jm/iqy Kwu+43FVZW7h4yuXomVp6UuWIT6Sg/VJXi9ten+rc+l19GBIQZL3EamIp2b7BzpAMH AG01UEowDHFBoG6FDk/Rw+ddPer+1H7Ba/aKSy3s= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 38FBFVCN068970 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 15 Sep 2023 06:15:31 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 15 Sep 2023 06:15:30 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 15 Sep 2023 06:15:30 -0500 Received: from localhost (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 38FBFT0S036169; Fri, 15 Sep 2023 06:15:30 -0500 From: Chirag Shilwant To: Praneeth Bajjuri , Denys Dmytriyenko , Ryan Eatmon , CC: Sai Sree Kartheek Adivi , Paresh Bhagat , Khasim , Gyan Gupta Subject: [meta-ti][master/kirkstone][PATCH v4 1/2] recipes-bsp: u-boot: Add u-boot-mergeconfig.inc to handle fragment u-boot config Date: Fri, 15 Sep 2023 16:45:22 +0530 Message-ID: <20230915111523.2274146-1-c-shilwant@ti.com> X-Mailer: git-send-email 2.34.1 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 ; Fri, 15 Sep 2023 11:15:43 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16984 - U-boot recipe in OE-Core supports out-of-tree config fragments that are passed via SRC_URI and automatically merges all *.cfg files as fragments. This makes specifying config fragments in the machine configuration a bit difficult. Hence, add a logic which will ensure we handle u-boot config fragments using a new variable UBOOT_CONFIG_FRAGMENTS. - The u-boot-mergeconfig.inc will allow us to build u-boot with list of config fragments specified in UBOOT_CONFIG_FRAGMENTS along with the base defconfig mentioned in UBOOT_MACHINE. - Include u-boot-mergeconfig.inc in u-boot-ti.inc Signed-off-by: Chirag Shilwant Reviewed-by: Denys Dmytriyenko --- v4: - Added an extra check for UBOOT_MACHINE being set - Commit Message Formatting v3: - s/UBOOT_CONFIG_FRAGMENT/UBOOT_CONFIG_FRAGMENTS - Use do_configure:append instead of do_compile:append v2: - Split a single patch into 2 seperate patches - Add detail commit message meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc | 7 +++++++ meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 1 + 2 files changed, 8 insertions(+) create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc new file mode 100644 index 00000000..c7ce5047 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc @@ -0,0 +1,7 @@ +do_configure:append () { + if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ] + then + oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS} + oe_runmake -C ${S} O=${B} olddefconfig + fi +} 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 f3285c23..5292517b 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 @@ -7,6 +7,7 @@ SPL_BINARY ?= "MLO" require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc +require u-boot-mergeconfig.inc FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:" From patchwork Fri Sep 15 11:15:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chirag Shilwant X-Patchwork-Id: 30479 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 DC726EE6457 for ; Fri, 15 Sep 2023 11:15:43 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.18085.1694776538947930259 for ; Fri, 15 Sep 2023 04:15:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=IBK/ARZW; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: c-shilwant@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 38FBFYT9053712; Fri, 15 Sep 2023 06:15:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1694776534; bh=kxAwtcTyF/0ZAyF1zuLBiYVwwwoJVv0AC2QhAbn9CkI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=IBK/ARZW4qlJ5WgeFZAPaJXQGAbx1yOWkxwn5gyLFNzA5gkRjN/GqgqroO2MRlLj+ vUlAgJUfYUBiKG7ovI10Nr9YqqUmUuYevLFugbYiGEHBnUXHRH20H6PjGcEGibBltr oq4Hzg2CHpKheSYFSqCaSDfZnwurNwyR6/T+KJAI= Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 38FBFYuB052610 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 15 Sep 2023 06:15:34 -0500 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 15 Sep 2023 06:15:33 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 15 Sep 2023 06:15:33 -0500 Received: from localhost (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 38FBFWP8051790; Fri, 15 Sep 2023 06:15:33 -0500 From: Chirag Shilwant To: Praneeth Bajjuri , Denys Dmytriyenko , Ryan Eatmon , CC: Sai Sree Kartheek Adivi , Paresh Bhagat , Khasim , Gyan Gupta Subject: [meta-ti][master/kirkstone][PATCH v4 2/2] conf: machine: Add am62xxsip-evm configuration Date: Fri, 15 Sep 2023 16:45:23 +0530 Message-ID: <20230915111523.2274146-2-c-shilwant@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915111523.2274146-1-c-shilwant@ti.com> References: <20230915111523.2274146-1-c-shilwant@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 ; Fri, 15 Sep 2023 11:15:43 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16985 - Add A53 and R5 machine configurations for am62xxsip-evm. - Use UBOOT_CONFIG_FRAGMENTS as am62xsip_sk_r5.config in R5 machine configuration. This will ensure we build u-boot-r5 with baseconfig as am62x_evm_r5_defconfig and config fragment as am62xsip_sk_r5.config. Signed-off-by: Chirag Shilwant Reviewed-by: Praneeth Bajjuri --- v4: - Add comment description for UBOOT_CONFIG_FRAGMENTS v3: - s/UBOOT_CONFIG_FRAGMENT/UBOOT_CONFIG_FRAGMENTS - Update commit message v2: - Split a single patch into 2 patches meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 16 ++++++++++++++++ meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 13 +++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xxsip-evm.conf diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf new file mode 100644 index 00000000..b7513996 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: AM62XX SIP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf new file mode 100644 index 00000000..dc4f3b77 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: AM62XX SIP EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM + +require conf/machine/include/am62xx.inc + +KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" + +KERNEL_DEVICETREE = " \ + ti/k3-am625-sk.dtb \ +" + +UBOOT_MACHINE = "am62x_evm_a53_defconfig"