summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Riedmueller <s.riedmueller@phytec.de>2018-09-04 09:28:31 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2018-09-07 09:05:14 (GMT)
commite895be8010b8a9b130f6a9c033c46e699a38c824 (patch)
treef88c66dc0710f3a2fd4d8d64903f8ececb7620ad
parentf485db58f6df06a675fd81b33948f4b524fd7920 (diff)
downloadmeta-phytec-e895be8010b8a9b130f6a9c033c46e699a38c824.zip
meta-phytec-e895be8010b8a9b130f6a9c033c46e699a38c824.tar.bz2
machines: phyimx6ul: Make imx6ul independent from imx6
Although the i.MX 6UL has some similarity with the i.MX 6 architecture it still is a separate architecture with its own features and should therefore be represented as such. Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/include/phyimx6ul.inc31
-rw-r--r--conf/machine/phyboard-segin-imx6ul-2.conf1
-rw-r--r--conf/machine/phyboard-segin-imx6ul-3.conf1
-rw-r--r--conf/machine/phyboard-segin-imx6ul-4.conf1
-rw-r--r--conf/machine/phyboard-segin-imx6ul-5.conf1
-rw-r--r--recipes-graphics/libsdl/libsdl_%.bbappend4
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend2
7 files changed, 33 insertions, 8 deletions
diff --git a/conf/machine/include/phyimx6ul.inc b/conf/machine/include/phyimx6ul.inc
index f56a49e..de928f0 100644
--- a/conf/machine/include/phyimx6ul.inc
+++ b/conf/machine/include/phyimx6ul.inc
@@ -1,7 +1,9 @@
# Common settings for phytecs imx6ul boards
-DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
+include conf/machine/include/soc-family.inc
+
+SOC_FAMILY .= ":mx6ul"
-include conf/machine/include/phyimx6.inc
+DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
include conf/machine/include/tune-cortexa7.inc
SERIAL_CONSOLES ?= "115200;ttymxc0"
@@ -10,9 +12,23 @@ SERIAL_CONSOLES ?= "115200;ttymxc0"
MACHINE_SOCARCH = "${TUNE_PKGARCH}-mx6ul"
PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
+#Bootloader
+PREFERRED_PROVIDER_virtual/bootloader ?= "barebox"
+# Kernel
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
+KERNEL_IMAGETYPE ?= "zImage"
+# Install modules in initramfs and roofs
+PACKAGE_INSTALL_append = " kernel-modules"
+# Ship kernel modules
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+# dont install kernelimage to rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+
# cpu feature overwrite support
MACHINEOVERRIDES .= ":imxpxp"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat"
+
QT_QPA_DEFAULT_PLATFORM ?= "linuxfb"
# Use the expected value of the ubifs filesystem's volume name in the kernel
@@ -22,11 +38,22 @@ UBI_VOLNAME = "root"
MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 7943"
UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
+#WIC
+IMAGE_CLASSES += "wic-helper"
+IMAGE_BOOT_FILES = "zImage ${@parse_dtbs(d)}"
+WKS_FILES_mx6ul ?= "imx6-sdimage.wks"
+
+# default images to build
+IMAGE_FSTYPES ?= "tar.gz wic ubifs"
+
# Avoid pulling package 'gstreamer1.0-plugins-bad-meta' into the image
# 'core-image-sato', because the recipe gstreamer1.0-plugins-bad depends on
# virtual/libgles2.
RRECOMMENDS_gst-player-bin_remove_pn-gst-player = "gstreamer1.0-plugins-bad-meta"
+# XServer
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+# We don't support a Xserver yet.
# Don't build the X server with xwayland support. It depends on libepoxy
# (OpenGL function pointer management library) that depends on EGL.
PACKAGECONFIG_remove_pn-xserver-xorg = "xwayland"
diff --git a/conf/machine/phyboard-segin-imx6ul-2.conf b/conf/machine/phyboard-segin-imx6ul-2.conf
index 9079a5f..41f7453 100644
--- a/conf/machine/phyboard-segin-imx6ul-2.conf
+++ b/conf/machine/phyboard-segin-imx6ul-2.conf
@@ -6,7 +6,6 @@
require conf/machine/include/phyimx6ul.inc
-SOC_FAMILY .= ":mx6ul"
SOC_FAMILY .= ":phyboard-segin-imx6ul"
# Kernel
diff --git a/conf/machine/phyboard-segin-imx6ul-3.conf b/conf/machine/phyboard-segin-imx6ul-3.conf
index b5fe08c..f3186f4 100644
--- a/conf/machine/phyboard-segin-imx6ul-3.conf
+++ b/conf/machine/phyboard-segin-imx6ul-3.conf
@@ -6,7 +6,6 @@
require conf/machine/include/phyimx6ul.inc
-SOC_FAMILY .= ":mx6ul"
SOC_FAMILY .= ":phyboard-segin-imx6ul"
# Kernel
diff --git a/conf/machine/phyboard-segin-imx6ul-4.conf b/conf/machine/phyboard-segin-imx6ul-4.conf
index f582d57..9e668b3 100644
--- a/conf/machine/phyboard-segin-imx6ul-4.conf
+++ b/conf/machine/phyboard-segin-imx6ul-4.conf
@@ -6,7 +6,6 @@
require conf/machine/include/phyimx6ul.inc
-SOC_FAMILY .= ":mx6ul"
SOC_FAMILY .= ":phyboard-segin-imx6ul"
# Kernel
diff --git a/conf/machine/phyboard-segin-imx6ul-5.conf b/conf/machine/phyboard-segin-imx6ul-5.conf
index d667125..b3b1f3b 100644
--- a/conf/machine/phyboard-segin-imx6ul-5.conf
+++ b/conf/machine/phyboard-segin-imx6ul-5.conf
@@ -6,7 +6,6 @@
require conf/machine/include/phyimx6ul.inc
-SOC_FAMILY .= ":mx6ul"
SOC_FAMILY .= ":phyboard-segin-imx6ul"
# Kernel
diff --git a/recipes-graphics/libsdl/libsdl_%.bbappend b/recipes-graphics/libsdl/libsdl_%.bbappend
index 2566eab..d056605 100644
--- a/recipes-graphics/libsdl/libsdl_%.bbappend
+++ b/recipes-graphics/libsdl/libsdl_%.bbappend
@@ -1,8 +1,8 @@
# Avoid dependency to mesa when building core-image-sato
-DEPENDS_remove_mx6 = "libglu"
-DEPENDS_remove_mx6 = "virtual/libgl"
DEPENDS_remove_ti33x = "libglu"
DEPENDS_remove_ti33x = "virtual/libgl"
+DEPENDS_remove_mx6ul = "libglu"
+DEPENDS_remove_mx6ul = "virtual/libgl"
DEPENDS_remove_rk3288 = "libglu"
DEPENDS_remove_rk3288 = "virtual/libgl"
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index 797895d..80f4066 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -1,6 +1,8 @@
# Avoid dependency virtual/gl when buliding core-image-sato
PACKAGECONFIG_remove_mx6 = "dri"
PACKAGECONFIG_remove_mx6 = "glx"
+PACKAGECONFIG_remove_mx6ul = "dri"
+PACKAGECONFIG_remove_mx6ul = "glx"
PACKAGECONFIG_remove_ti33x = "dri"
PACKAGECONFIG_remove_ti33x = "glx"
PACKAGECONFIG_remove_rk3288 = "dri"