summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Christ <s.lengfeld@phytec.de>2016-11-21 14:19:43 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-11-29 09:12:25 (GMT)
commitdb27215806b6fc95020cb9a8cbbcf2cb8723f95a (patch)
treef9dbcf10d9adbdce303fc2d9203d5b1cdd776ed6
parent3e9b2952de743cdb3b53779a51335dd10c8e2a59 (diff)
downloadmeta-phytec-db27215806b6fc95020cb9a8cbbcf2cb8723f95a.zip
meta-phytec-db27215806b6fc95020cb9a8cbbcf2cb8723f95a.tar.bz2
machines: imx6: refactor includes for UltraLite and Quad/DualLite
The i.MX6 SoCs UltraLite and Quad/DualLite are quite different. Therefore split the configuration into two separate files 'phyimx6ul.inc' and 'phyimx6qdl.inc' and a common file 'phyimx6.inc'. This refactoring does not change the config variables of the machines. Tested with "bitbake -e". The only difference is the values of PREFERRED_PROVIDER_virtual/egl, .. for the i.MX6 UltraLite. Now it has the default values: PREFERRED_PROVIDER_virtual/egl="mesa" PREFERRED_PROVIDER_virtual/libgl="mesa" PREFERRED_PROVIDER_virtual/libgles2="mesa" PREFERRED_PROVIDER_virtual/libgles1="mesa" Signed-off-by: Stefan Lengfeld <s.lengfeld@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/include/imx-base.inc33
-rw-r--r--conf/machine/include/phyimx6.inc32
-rw-r--r--conf/machine/include/phyimx6qdl.inc29
-rw-r--r--conf/machine/include/phyimx6ul.inc20
-rw-r--r--conf/machine/phyboard-alcor-imx6-1.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-3.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-4.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-5.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-7.conf2
-rw-r--r--conf/machine/phyboard-subra-imx6-1.conf2
-rw-r--r--conf/machine/phyboard-subra-imx6-2.conf2
-rw-r--r--conf/machine/phycard-imx6-1.conf2
-rw-r--r--conf/machine/phycard-imx6-2.conf2
-rw-r--r--conf/machine/phyflex-imx6-1.conf2
-rw-r--r--conf/machine/phyflex-imx6-10.conf2
-rw-r--r--conf/machine/phyflex-imx6-2.conf2
-rw-r--r--conf/machine/phyflex-imx6-3.conf2
-rw-r--r--conf/machine/phyflex-imx6-4.conf2
-rw-r--r--conf/machine/phyflex-imx6-5.conf2
-rw-r--r--conf/machine/phyflex-imx6-6.conf2
-rw-r--r--conf/machine/phyflex-imx6-7.conf2
-rw-r--r--conf/machine/phyflex-imx6-8.conf2
-rw-r--r--conf/machine/phyflex-imx6-9.conf2
23 files changed, 73 insertions, 79 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 7283723..97f8735 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -2,36 +2,3 @@
include conf/machine/include/soc-family.inc
-# XServer
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-# We don't support a Xserver yet.
-#XSERVER_DRIVER = "xf86-video-fbdev"
-#XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante"
-#XSERVER = "xserver-xorg \
-# xf86-input-evdev \
-# ${XSERVER_DRIVER}"
-
-# Ship kernel modules
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
-
-# Float-Point setting
-DEFAULTTUNE ?= "cortexa9hf-neon"
-
-# Sub-architecture support
-MACHINE_SOCARCH = "${TUNE_PKGARCH}-mx6qdl"
-PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
-
-# mx6 GPU libraries
-PREFERRED_PROVIDER_virtual/egl ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_virtual/libgl ?= "imx-gpu-viv"
-
-# sd-card image
-IMAGE_CLASSES += "image_types_fsl"
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-KERNEL_IMAGETYPE = "zImage"
-
-MACHINE_FEATURES = "apm usbgadget usbhost vfat"
diff --git a/conf/machine/include/phyimx6.inc b/conf/machine/include/phyimx6.inc
index 10733b5..aa474db 100644
--- a/conf/machine/include/phyimx6.inc
+++ b/conf/machine/include/phyimx6.inc
@@ -1,7 +1,6 @@
# Common settings for phytecs imx6 boards
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/soc-family.inc
SOC_FAMILY = "mx6"
@@ -16,17 +15,26 @@ INTREE_DEFCONFIG_pn-linux-mainline = "imx_v6_v7_defconfig"
# Install modules in initramfs and roofs
PACKAGE_INSTALL_append = " kernel-modules"
-SERIAL_CONSOLES ?= "115200;ttymxc3"
# dont install kernelimage to rootfs
RDEPENDS_kernel-base = ""
-# Use the expected value of the ubifs filesystem's volume name in the kernel
-UBI_VOLNAME = "root"
-# The biggest NANDs on current modules are 1GB. With current partition layout,
-# this sums up to 7943 LEBs available for the ubifs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8083"
-UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
+# XServer
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+# We don't support a Xserver yet.
+#XSERVER_DRIVER = "xf86-video-fbdev"
+#XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante"
+#XSERVER = "xserver-xorg \
+# xf86-input-evdev \
+# ${XSERVER_DRIVER}"
-# Firmware files
-MACHINE_EXTRA_RRECOMMENDS_append_mx6q = " firmware-imx-vpu-mx6q"
-MACHINE_EXTRA_RRECOMMENDS_append_mx6dl = " firmware-imx-vpu-mx6dl"
+# Ship kernel modules
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+# sd-card image
+IMAGE_CLASSES += "image_types_fsl"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+KERNEL_IMAGETYPE = "zImage"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat"
diff --git a/conf/machine/include/phyimx6qdl.inc b/conf/machine/include/phyimx6qdl.inc
new file mode 100644
index 0000000..cd9cbe5
--- /dev/null
+++ b/conf/machine/include/phyimx6qdl.inc
@@ -0,0 +1,29 @@
+# Common settings for phytecs imx6qdl boards
+
+include conf/machine/include/phyimx6.inc
+include conf/machine/include/tune-cortexa9.inc
+
+DEFAULTTUNE = "cortexa9hf-neon"
+
+SERIAL_CONSOLES ?= "115200;ttymxc3"
+
+# Sub-architecture support
+MACHINE_SOCARCH = "${TUNE_PKGARCH}-mx6qdl"
+PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+UBI_VOLNAME = "root"
+# The biggest NANDs on current modules are 1GB. With current partition layout,
+# this sums up to 7943 LEBs available for the ubifs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8083"
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
+
+# mx6 GPU libraries
+PREFERRED_PROVIDER_virtual/egl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgl ?= "imx-gpu-viv"
+
+# Firmware files
+MACHINE_EXTRA_RRECOMMENDS_append_mx6q = " firmware-imx-vpu-mx6q"
+MACHINE_EXTRA_RRECOMMENDS_append_mx6dl = " firmware-imx-vpu-mx6dl"
diff --git a/conf/machine/include/phyimx6ul.inc b/conf/machine/include/phyimx6ul.inc
index e68e773..0381760 100644
--- a/conf/machine/include/phyimx6ul.inc
+++ b/conf/machine/include/phyimx6ul.inc
@@ -1,25 +1,15 @@
# Common settings for phytecs imx6ul boards
-include conf/machine/include/imx-base.inc
+include conf/machine/include/phyimx6.inc
include conf/machine/include/tune-cortexa7.inc
-SOC_FAMILY = "mx6"
DEFAULTTUNE = "cortexa7hf-neon"
-#Bootloader
-PREFERRED_PROVIDER_virtual/bootloader ?= "barebox"
-INTREE_DEFCONFIG_pn-barebox = "imx_v7_defconfig"
-
-# Kernel
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-KERNEL_IMAGETYPE ?= "zImage"
-INTREE_DEFCONFIG_pn-linux-mainline = "imx_v6_v7_defconfig"
-# Install modules in initramfs and roofs
-PACKAGE_INSTALL_append = " kernel-modules"
-
SERIAL_CONSOLES ?= "115200;ttymxc0"
-# dont install kernelimage to rootfs
-RDEPENDS_kernel-base = ""
+
+# Sub-architecture support
+MACHINE_SOCARCH = "${TUNE_PKGARCH}-mx6ul"
+PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
# Use the expected value of the ubifs filesystem's volume name in the kernel
UBI_VOLNAME = "root"
diff --git a/conf/machine/phyboard-alcor-imx6-1.conf b/conf/machine/phyboard-alcor-imx6-1.conf
index 41168db..aab46a7 100644
--- a/conf/machine/phyboard-alcor-imx6-1.conf
+++ b/conf/machine/phyboard-alcor-imx6-1.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE:
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyboard-alcor-imx6"
diff --git a/conf/machine/phyboard-mira-imx6-3.conf b/conf/machine/phyboard-mira-imx6-3.conf
index fe6e854..14afc44 100644
--- a/conf/machine/phyboard-mira-imx6-3.conf
+++ b/conf/machine/phyboard-mira-imx6-3.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyboard-mira-imx6"
diff --git a/conf/machine/phyboard-mira-imx6-4.conf b/conf/machine/phyboard-mira-imx6-4.conf
index 742b7e2..13ca3f2 100644
--- a/conf/machine/phyboard-mira-imx6-4.conf
+++ b/conf/machine/phyboard-mira-imx6-4.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6dl"
SOC_FAMILY .= ":phyboard-mira-imx6"
diff --git a/conf/machine/phyboard-mira-imx6-5.conf b/conf/machine/phyboard-mira-imx6-5.conf
index 82cb5da..29db3b9 100644
--- a/conf/machine/phyboard-mira-imx6-5.conf
+++ b/conf/machine/phyboard-mira-imx6-5.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyboard-mira-imx6"
diff --git a/conf/machine/phyboard-mira-imx6-7.conf b/conf/machine/phyboard-mira-imx6-7.conf
index 01d0221..f603d0a 100644
--- a/conf/machine/phyboard-mira-imx6-7.conf
+++ b/conf/machine/phyboard-mira-imx6-7.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6dl"
SOC_FAMILY .= ":phyboard-mira-imx6"
diff --git a/conf/machine/phyboard-subra-imx6-1.conf b/conf/machine/phyboard-subra-imx6-1.conf
index de5bfa2..d7c0eb2 100644
--- a/conf/machine/phyboard-subra-imx6-1.conf
+++ b/conf/machine/phyboard-subra-imx6-1.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6dl"
SOC_FAMILY .= ":phyboard-subra-imx6"
diff --git a/conf/machine/phyboard-subra-imx6-2.conf b/conf/machine/phyboard-subra-imx6-2.conf
index a314125..7f2e185 100644
--- a/conf/machine/phyboard-subra-imx6-2.conf
+++ b/conf/machine/phyboard-subra-imx6-2.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyboard-subra-imx6"
diff --git a/conf/machine/phycard-imx6-1.conf b/conf/machine/phycard-imx6-1.conf
index b194c53..eeb0985 100644
--- a/conf/machine/phycard-imx6-1.conf
+++ b/conf/machine/phycard-imx6-1.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phycard-imx6"
diff --git a/conf/machine/phycard-imx6-2.conf b/conf/machine/phycard-imx6-2.conf
index d7f4ca4..dafc316 100644
--- a/conf/machine/phycard-imx6-2.conf
+++ b/conf/machine/phycard-imx6-2.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE:
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phycard-imx6"
diff --git a/conf/machine/phyflex-imx6-1.conf b/conf/machine/phyflex-imx6-1.conf
index 8aae431..2b1cb77 100644
--- a/conf/machine/phyflex-imx6-1.conf
+++ b/conf/machine/phyflex-imx6-1.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-10.conf b/conf/machine/phyflex-imx6-10.conf
index 613cb8b..89a1727 100644
--- a/conf/machine/phyflex-imx6-10.conf
+++ b/conf/machine/phyflex-imx6-10.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6dl"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-2.conf b/conf/machine/phyflex-imx6-2.conf
index d810503..9587206 100644
--- a/conf/machine/phyflex-imx6-2.conf
+++ b/conf/machine/phyflex-imx6-2.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-3.conf b/conf/machine/phyflex-imx6-3.conf
index 339464e..a2eef71 100644
--- a/conf/machine/phyflex-imx6-3.conf
+++ b/conf/machine/phyflex-imx6-3.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-4.conf b/conf/machine/phyflex-imx6-4.conf
index 07d14af..063a849 100644
--- a/conf/machine/phyflex-imx6-4.conf
+++ b/conf/machine/phyflex-imx6-4.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-5.conf b/conf/machine/phyflex-imx6-5.conf
index ab49e33..fe6f81b 100644
--- a/conf/machine/phyflex-imx6-5.conf
+++ b/conf/machine/phyflex-imx6-5.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6q"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-6.conf b/conf/machine/phyflex-imx6-6.conf
index dbe7aef..5ea2feb 100644
--- a/conf/machine/phyflex-imx6-6.conf
+++ b/conf/machine/phyflex-imx6-6.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6dl"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-7.conf b/conf/machine/phyflex-imx6-7.conf
index 150cc8e..05b62a5 100644
--- a/conf/machine/phyflex-imx6-7.conf
+++ b/conf/machine/phyflex-imx6-7.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6dl"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-8.conf b/conf/machine/phyflex-imx6-8.conf
index 0e42fb2..c38adef 100644
--- a/conf/machine/phyflex-imx6-8.conf
+++ b/conf/machine/phyflex-imx6-8.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6dl"
SOC_FAMILY .= ":phyflex-imx6"
diff --git a/conf/machine/phyflex-imx6-9.conf b/conf/machine/phyflex-imx6-9.conf
index 9f0ee16..c3814fe 100644
--- a/conf/machine/phyflex-imx6-9.conf
+++ b/conf/machine/phyflex-imx6-9.conf
@@ -5,7 +5,7 @@
#@SUPPORTEDIMAGE: phytec-qt5demo-image
#from http://www.phytec.de
-require conf/machine/include/phyimx6.inc
+require conf/machine/include/phyimx6qdl.inc
SOC_FAMILY .= ":mx6dl"
SOC_FAMILY .= ":phyflex-imx6"