From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 2AF1BE00A64; Wed, 17 Jun 2015 11:02:48 -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,DKIM_SIGNED, DKIM_VALID,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 * [209.85.216.172 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-qc0-f172.google.com (mail-qc0-f172.google.com [209.85.216.172]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id D3670E009C5 for ; Wed, 17 Jun 2015 11:02:46 -0700 (PDT) Received: by qcsf5 with SMTP id f5so16193480qcs.2 for ; Wed, 17 Jun 2015 11:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :organization; bh=kxVV3jxzO6AQRnc0YZHs887G/yBmP4G1J1Hcue7byCI=; b=uUTDEOhO/mWw6gYgzfE2pv7CWqssOutopsFXFY0rCa1OltyluXw9xo+XktK4H5d1xD 6pEgBDcTXtQbguUyuSBjEcxBB8b12LD4shS8jIPoihao3BVUlOtYUpVn29UHpD1SfL39 TP1Nd7QI/yuQxcDHx+URGcW9Dk4TJmQBfxFTLqHRuCbJUSZHh7Wjm1jFW2EVuqbvWS0g SgAgRAy1x70CvSQ95VsUvDmkW6QpdUarJMrCecE39bsnbYGdURlSy23gU+2OoQ2Z50gY YpdpqQ8DZ87JDxTL3eU0xayWAPYq+EORxYgZY/Vw+shR/X3cva0HFOdbcJw+mCsVjFRU pcnQ== X-Received: by 10.55.20.16 with SMTP id e16mr15260559qkh.71.1434564166008; Wed, 17 Jun 2015 11:02:46 -0700 (PDT) Received: from localhost ([177.100.226.57]) by mx.google.com with ESMTPSA id u10sm2539145qgd.14.2015.06.17.11.02.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2015 11:02:44 -0700 (PDT) Sender: Otavio Salvador Received: by localhost (sSMTP sendmail emulation); Wed, 17 Jun 2015 15:02:39 -0300 From: Otavio Salvador To: meta-freescale Mailing List Date: Wed, 17 Jun 2015 15:02:24 -0300 Message-Id: <1434564146-11377-2-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1434564146-11377-1-git-send-email-otavio@ossystems.com.br> References: <1434564146-11377-1-git-send-email-otavio@ossystems.com.br> Organization: O.S. Systems Software LTDA. Cc: Otavio Salvador Subject: [meta-fsl-arm][PATCH 2/4] fsl-default-providers.inc: Move content to imx-base.inc and mxs-base.inc 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: Wed, 17 Jun 2015 18:02:48 -0000 The fsl-default-providers.inc is very simple and makes harder to understand the defaults assumed for i.MX SoCs. This patch moves the contents of it to the imx-base.inc and mxs-base.inc so it can be more easily changed. Change-Id: Ica5e155959dee881be089accc735c6aba6cd0e4d Signed-off-by: Otavio Salvador --- conf/machine/include/fsl-default-providers.inc | 6 ------ conf/machine/include/imx-base.inc | 5 ++++- conf/machine/include/mxs-base.inc | 5 ++++- 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 conf/machine/include/fsl-default-providers.inc diff --git a/conf/machine/include/fsl-default-providers.inc b/conf/machine/include/fsl-default-providers.inc deleted file mode 100644 index c738d49..0000000 --- a/conf/machine/include/fsl-default-providers.inc +++ /dev/null @@ -1,6 +0,0 @@ -# Freescale BSP default providers - -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/kernel ??= "linux-imx" -PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc" -PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 51625eb..fc50ee1 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -2,11 +2,12 @@ include conf/machine/include/fsl-default-settings.inc include conf/machine/include/fsl-default-versions.inc -include conf/machine/include/fsl-default-providers.inc include conf/machine/include/soc-family.inc # Set specific make target and binary suffix +PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc" +PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc" UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX ?= "imx" @@ -18,6 +19,7 @@ UBOOT_ENTRYPOINT_mx6sl = "0x80008000" UBOOT_ENTRYPOINT_mx6sx = "0x80008000" UBOOT_ENTRYPOINT_vf = "0x80008000" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER_DRIVER = "xf86-video-fbdev" XSERVER_DRIVER_mx5 = "xf86-video-imxfb" XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante" @@ -107,6 +109,7 @@ PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa" PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/kernel ??= "linux-imx" PREFERRED_PROVIDER_virtual/kernel_mx3 ?= "linux-fslc" SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc index a6c34e1..8632f15 100644 --- a/conf/machine/include/mxs-base.inc +++ b/conf/machine/include/mxs-base.inc @@ -2,19 +2,22 @@ include conf/machine/include/fsl-default-settings.inc include conf/machine/include/fsl-default-versions.inc -include conf/machine/include/fsl-default-providers.inc include conf/machine/include/soc-family.inc include conf/machine/include/tune-arm926ejs.inc SOC_FAMILY = "mxs" +PREFERRED_PROVIDER_virtual/kernel ??= "linux-imx" PREFERRED_PROVIDER_virtual/kernel_mx23 ?= "linux-fslc" +PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc" +PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_MAKE_TARGET = "u-boot.sb" UBOOT_SUFFIX = "sb" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ xf86-input-evdev \ xf86-video-fbdev" -- 2.4.3