From mboxrd@z Thu Jan 1 00:00:00 1970 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 7AF74EEAA5C for ; Thu, 14 Sep 2023 17:20:31 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.503.1694712029238604034 for ; Thu, 14 Sep 2023 10:20:30 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 751BF40C3A; Thu, 14 Sep 2023 17:20:28 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mt5c9kPkfPaS; Thu, 14 Sep 2023 17:20:28 +0000 (UTC) Received: from mail.denix.org (pool-100-15-110-236.washdc.fios.verizon.net [100.15.110.236]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 7D48240A28; Thu, 14 Sep 2023 17:20:18 +0000 (UTC) Received: by mail.denix.org (Postfix, from userid 1000) id 14840163CAA; Thu, 14 Sep 2023 13:20:18 -0400 (EDT) Date: Thu, 14 Sep 2023 13:20:18 -0400 From: Denys Dmytriyenko To: Chirag Shilwant Cc: Praneeth Bajjuri , Ryan Eatmon , meta-ti@lists.yoctoproject.org, Sai Sree Kartheek Adivi , Paresh Bhagat , Khasim , Gyan Gupta Subject: Re: [meta-ti][master/kirkstone][PATCH v3 1/2] recipes-bsp: u-boot: Add u-boot-mergeconfig.inc to handle fragment u-boot config Message-ID: <20230914172018.GL3359@denix.org> References: <20230914115813.1104022-1-c-shilwant@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230914115813.1104022-1-c-shilwant@ti.com> User-Agent: Mutt/1.5.20 (2009-06-14) 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, 14 Sep 2023 17:20:31 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16969 On Thu, Sep 14, 2023 at 05:28:12PM +0530, Chirag Shilwant wrote: > - 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 Thanks for addressing majority of my comments! Would be nice to keep the standard formatting for the text and line wrap under 80 characters, instead of writing long paragraphs as a single line. > Signed-off-by: Chirag Shilwant > --- Also, patch revision logs here are useful to keep track of what's changed between revisions. > 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..e2ae5894 > --- /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}" ] Since we are going with the minimal approach for now, would be nice to also check that UBOOT_MACHINE is set before using fragments. > + 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:" > > -- > 2.34.1