From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 3CEEBE0056D; Thu, 26 Jun 2014 12:52:04 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [198.47.26.152 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 53A7CE0043B for ; Thu, 26 Jun 2014 12:51:53 -0700 (PDT) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5QJpqWC022088; Thu, 26 Jun 2014 14:51:52 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5QJpqSU012719; Thu, 26 Jun 2014 14:51:52 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Thu, 26 Jun 2014 14:51:51 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5QJpp17014388; Thu, 26 Jun 2014 14:51:51 -0500 Date: Thu, 26 Jun 2014 15:51:50 -0400 From: Denys Dmytriyenko To: Tom Rini Message-ID: <20140626195150.GC6700@edge> References: <1403806695-6302-1-git-send-email-denis@denix.org> <20140626193101.GQ9006@bill-the-cat> MIME-Version: 1.0 In-Reply-To: <20140626193101.GQ9006@bill-the-cat> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: meta-ti@yoctoproject.org Subject: Re: [PATCH v2] u-boot: switch from SPL/MLO to "ais" image for omapl138 SOCs X-BeenThere: meta-ti@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-ti layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 19:52:04 -0000 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline On Thu, Jun 26, 2014 at 03:33:20PM -0400, Tom Rini wrote: > On Thu, Jun 26, 2014 at 02:18:15PM -0400, Denys Dmytriyenko wrote: > > From: Denys Dmytriyenko > > > > Signed-off-by: Denys Dmytriyenko > > Cc: Tom Rini > > --- > > conf/machine/am180x-evm.conf | 4 +++- > > recipes-bsp/u-boot/u-boot-ti.inc | 4 ++-- > > recipes-bsp/u-boot/u-boot_2014.07.bb | 3 +++ > > 3 files changed, 8 insertions(+), 3 deletions(-) > > > > diff --git a/conf/machine/am180x-evm.conf b/conf/machine/am180x-evm.conf > > index 3182e8a..f83814e 100644 > > --- a/conf/machine/am180x-evm.conf > > +++ b/conf/machine/am180x-evm.conf > > @@ -5,7 +5,9 @@ > > require conf/machine/include/davinci.inc > > require conf/machine/include/omapl138.inc > > > > -UBOOT_MACHINE = "da850evm_config" > > +UBOOT_MACHINE = "da850_am18xxevm_config" > > +UBOOT_SUFFIX = "ais" > > + > > UBOOT_ENTRYPOINT = "0xc0008000" > > UBOOT_LOADADDRESS = "0xc0008000" > > Since we've got ENTRYPOINT/LOADADDRESS in here which also are omapl138 > rather than am180x specific, that's OK with me. > > > diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc > > index c024e96..0cb53ea 100644 > > --- a/recipes-bsp/u-boot/u-boot-ti.inc > > +++ b/recipes-bsp/u-boot/u-boot-ti.inc > > @@ -1,3 +1,5 @@ > > +UBOOT_SUFFIX ?= "img" > > + > > require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc > > This isn't completely safe, is it? The COREBASE version also has ?= for > UBOOT_SUFFIX too. We need to either convince oe-core to use ??= or just > populate our machine.conf/soc.inc files with UBOOT_SUFFIX. That's why I moved it before require COREBASE, as otherwise it will be set there... So, if machine defines own UBOOT_SUFFIX, our .inc won't overwrite it and COREBASE version won't either. If machine doesn't define one, we set it to "img" here. And for recipes not using our version of .inc, it will be set to "bin" in COREBASE .inc -- Denys