From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id B03D7E00F1E; Fri, 25 Sep 2015 15:49:41 -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=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [74.55.86.74 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from smtp.webfaction.com (mail6.webfaction.com [74.55.86.74]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id A617FE00BEC for ; Fri, 25 Sep 2015 15:49:40 -0700 (PDT) Received: from [192.168.1.10] (c-73-194-208-34.hsd1.nj.comcast.net [73.194.208.34]) by smtp.webfaction.com (Postfix) with ESMTP id 811E0207876F; Fri, 25 Sep 2015 22:49:38 +0000 (UTC) To: Zhenhua Luo , meta-freescale@yoctoproject.org References: <1439374948-918-1-git-send-email-zhenhua.luo@freescale.com> <1439374948-918-18-git-send-email-zhenhua.luo@freescale.com> From: Bob Cochran Message-ID: <5605CF80.60506@mindchasers.com> Date: Fri, 25 Sep 2015 18:49:36 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <1439374948-918-18-git-send-email-zhenhua.luo@freescale.com> Subject: Re: [PATCH 18/24] reorg the qoriq include files X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2015 22:49:41 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 08/12/2015 06:22 AM, Zhenhua Luo wrote: > * update qoriq-base.inc to ensure common bits of QorIQ ARM and QorIQ PPC are there > * add qoriq-ppc.inc to manage the common bits of QorIQ PPC targets > * update the qoriq-arm.inc to ensure QorIQ ARM specific bits are there > > Signed-off-by: Zhenhua Luo > --- > conf/machine/include/qoriq-arm.inc | 24 +++++++-------------- > conf/machine/include/qoriq-base.inc | 43 +++++++++++++++---------------------- > conf/machine/include/qoriq-ppc.inc | 11 ++++++++++ > 3 files changed, 36 insertions(+), 42 deletions(-) > create mode 100644 conf/machine/include/qoriq-ppc.inc > [snip] > diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc > index ed66fda..856af15 100644 > --- a/conf/machine/include/qoriq-base.inc > +++ b/conf/machine/include/qoriq-base.inc > @@ -1,32 +1,23 @@ > -# Provides the QorIQ common settings > require conf/machine/include/soc-family.inc > > -# providers > -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" > -PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" > -PREFERRED_PROVIDER_cryptodev = "cryptodev-qoriq" > -PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" > -PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" > -PREFERRED_PROVIDER_openssl = "openssl-qoriq" > -PREFERRED_PROVIDER_qemu = "qemu-qoriq" > -PREFERRED_PROVIDER_valgrind_e500v2 = "valgrind-qoriq" > - > -# versions > -PREFERRED_VERSION_qemu = "2.2.0+fsl" > -PREFERRED_VERSION_valgrind_e500v2 = "3.8.1+fsl" > - > -# settings > -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" > -MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" > -MACHINEOVERRIDES .= ":qoriq-ppc" > - > -IMAGE_CLASSES += "image_types_uboot" > -EXTRA_IMAGEDEPENDS += "u-boot" > - > +# Freescale BSP default providers > +PREFERRED_PROVIDER_u-boot_qoriq ?= "u-boot-qoriq" > +PREFERRED_PROVIDER_virtual/bootloader_qoriq ?= "u-boot-qoriq" > +PREFERRED_PROVIDER_virtual/kernel_qoriq ?= "linux-qoriq" > +PREFERRED_PROVIDER_cryptodev_qoriq = "cryptodev-qoriq" > +PREFERRED_PROVIDER_cryptodev-module_qoriq = "cryptodev-qoriq-module" > +PREFERRED_PROVIDER_cryptodev-tests_qoriq = "cryptodev-qoriq-tests" > +PREFERRED_PROVIDER_openssl_qoriq = "openssl-qoriq" > + > +# Define the default image type > +IMAGE_CLASSES ?= "image_types_uboot" > KERNEL_IMAGETYPE ?= "uImage" > > -SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" > -SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" > +MACHINE_FEATURES ?= "pci ext2 ext3 serial" > +MACHINE_EXTRA_RRECOMMENDS ?= "udev-rules-qoriq" > + > +EXTRA_IMAGEDEPENDS += "u-boot cst-native" > > -USE_VT = "0" > +USE_VT ?= "0" > > +MACHINEOVERRIDES .= ":qoriq" > diff --git a/conf/machine/include/qoriq-ppc.inc b/conf/machine/include/qoriq-ppc.inc > new file mode 100644 > index 0000000..b608782 > --- /dev/null > +++ b/conf/machine/include/qoriq-ppc.inc > @@ -0,0 +1,11 @@ > +require conf/machine/include/qoriq-base.inc > + > +UBOOT_ENTRYPOINT_qoriq-ppc = "0x80008000" > + > +MKUBIFS_ARGS_qoriq-ppc ??= "-m 512 -e 15360 -c 3600" > +UBINIZE_ARGS_qoriq-ppc ??= "-m 512 -p 16KiB -s 512" > + > +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" > +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" > + > +MACHINEOVERRIDES .= ":qoriq-ppc" > I don't think this is what we want since I get the following: MACHINEOVERRIDES="e5500-64b:qoriq:t1:t1040:t1040rdb-64b:qoriq-ppc" And this means that the generic files under meta-freescale like init-ifupdown/qoriq-ppc/interfaces is overriding my machine specific interfaces file. I believe we want it to be like: MACHINEOVERRIDES="e5500-64b:qoriq:qoriq-ppc:t1:t1040:t1040rdb-64b" I propose we simplify things a bit and just do the following in qoriq-ppc.inc: MACHINEOVERRIDES =. "qoriq:qoriq-ppc:" and yank the MACHINEOVERRIDES specifier in qoriq-base.inc. I would do the same sort of thing in qoriq-arm.inc. This way, there would be less chance of these overrides moving around again later because their relocation tends to pop up as an occasional nuisance during builds. Bob