From: Otavio Salvador <otavio@ossystems.com.br>
To: meta-freescale Mailing List <meta-freescale@yoctoproject.org>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Subject: [meta-fsl-arm][PATCH 2/4] fsl-default-providers.inc: Move content to imx-base.inc and mxs-base.inc
Date: Wed, 17 Jun 2015 15:02:24 -0300 [thread overview]
Message-ID: <1434564146-11377-2-git-send-email-otavio@ossystems.com.br> (raw)
In-Reply-To: <1434564146-11377-1-git-send-email-otavio@ossystems.com.br>
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 <otavio@ossystems.com.br>
---
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
next prev parent reply other threads:[~2015-06-17 18:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 18:02 [meta-fsl-arm][PATCH 1/4] core-image-weston: Fail gracefully if using incompatible DISTRO_FEATURES Otavio Salvador
2015-06-17 18:02 ` Otavio Salvador [this message]
2015-06-17 18:33 ` [meta-fsl-arm][PATCH 2/4] fsl-default-providers.inc: Move content to imx-base.inc and mxs-base.inc Nikolay Dimitrov
2015-06-17 18:38 ` Otavio Salvador
2015-06-17 19:27 ` Nikolay Dimitrov
2015-06-17 18:02 ` [meta-fsl-arm][PATCH 3/4] linux-fslc-mx6 (3.14-1.0.x): Add recipe Otavio Salvador
2015-06-17 18:28 ` Nikolay Dimitrov
2015-06-17 18:30 ` Otavio Salvador
2015-06-17 18:38 ` Nikolay Dimitrov
2015-06-17 18:39 ` Otavio Salvador
2015-06-17 19:25 ` Nikolay Dimitrov
2015-06-17 19:32 ` Daiane Angolini
2015-06-17 19:45 ` Otavio Salvador
2015-06-18 13:40 ` Daiane Angolini
2015-06-18 13:58 ` Otavio Salvador
2015-06-18 15:32 ` Nikolay Dimitrov
2015-06-18 16:21 ` Otavio Salvador
2015-06-18 16:38 ` Nikolay Dimitrov
2015-06-18 16:47 ` Otavio Salvador
2015-06-18 16:47 ` Ann Thornton
2015-06-18 17:10 ` Nikolay Dimitrov
2015-06-18 17:40 ` Otavio Salvador
2015-06-17 18:02 ` [meta-fsl-arm][PATCH 4/4] imx-base.inc: Use linux-fslc-mx6 for all i.MX6 by default Otavio Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434564146-11377-2-git-send-email-otavio@ossystems.com.br \
--to=otavio@ossystems.com.br \
--cc=meta-freescale@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.