Move machine dependent packages to machine config files

Add config also for imx53qsb machines

Change-Id: I5a391c29f917bf61bccbcd06a1973ee60dde8de9
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

9 files changed, 68 insertions, 64 deletions

diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 4932436..728a3ea 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -11,3 +11,14 @@ UBOOT_SUFFIX = "img"
 PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
+
+MACHINE_EXTRA_INSTALL = "\
+        libgles-omap3 \
+        libgles-omap3-rawdemos \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = "\
+        libgles-omap3-dev \
+        "
+
+ADB_PRODUCTID = "0x9018"
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index fdef2f3..dfbda91 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -2,3 +2,16 @@ IMAGE_CLASSES += "image-hdd"
 IMAGE_ROOTFS_ALIGNMENT = "1048576"
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
 IMAGE_FSTYPES = "ext3"
+
+MACHINE_EXTRA_INSTALL = "\
+        llvm3.2 \
+        libegl-mesa \
+        libegl-gallium \
+        libgles2-mesa \
+        mount-vboxsf \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = "\
+        libegl-mesa-dev \
+        libgles2-mesa-dev \
+        "
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
new file mode 100644
index 0000000..0d96d9a
--- /dev/null
+++ b/conf/distro/include/imx53qsb.conf
@@ -0,0 +1,13 @@
+IMAGE_FSTYPES = "tar.gz"
+
+PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51"
+
+MACHINE_EXTRA_INSTALL = "\
+        amd-gpu-x11-bin-mx51 \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgsl-fsl-mx51-dev \
+        libegl-mx51-dev \
+        libgles2-mx51-dev \
+        "
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index e232667..cf99d11 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -3,3 +3,19 @@ IMAGE_FSTYPES = "tar.gz ext3 sdcard"
 
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        gst-fsl-plugin \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
+
+ADB_PRODUCTID = "0x0d02"
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 5045c13..8eada21 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -2,3 +2,11 @@ IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg"
 
 PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics"
 PREFERRED_PROVIDER_virtual/libgl = "vc-graphics"
+
+MACHINE_EXTRA_INSTALL = "\
+        vc-graphics \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        vc-graphics-dev \
+        "
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index 88a3cfb..aa8f5e9 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -20,13 +20,9 @@ S = "${WORKDIR}/git/adb"
 
 FILES_${PN} += "${bindir}/adbd"
 
-PRODUCTID_beagleboard = "0x9018"
-PRODUCTID_mx6 = "0x0d02"
-PRODUCTID_raspberrypi = "0xabcd"
-
 do_configure() {
-        if [ -n "${PRODUCTID}" ]; then
-                sed -i -e 's/PRODUCT=.*/PRODUCT=${PRODUCTID}/' ${WORKDIR}/adb-init
+        if [ -n "${ADB_PRODUCTID}" ]; then
+                sed -i -e 's/PRODUCT=.*/PRODUCT=${ADB_PRODUCTID}/' ${WORKDIR}/adb-init
         fi
 }
 
diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
index 45366bd..53a4b1a 100644
--- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
+++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
@@ -1,2 +1,4 @@
 # dependency to x11 only when distro features have it
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
+
+PROVIDES += "virtual/libgl"
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index cc5a124..6dc4f1f 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -14,35 +14,7 @@ inherit core-image
 
 EXTRA_IMAGEDEPENDS_mx6 += "u-boot-script-boundary"
 
-MACHINE_EXTRA_INSTALL = ""
-
-MACHINE_EXTRA_INSTALL_raspberrypi += "\
-        vc-graphics \
-        "
-
-MACHINE_EXTRA_INSTALL_mx5 += "\
-        amd-gpu-x11-bin-mx51 \
-        "
-
-MACHINE_EXTRA_INSTALL_mx6 += "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        gst-fsl-plugin \
-        "
-
-MACHINE_EXTRA_INSTALL_beagleboard += "\
-        libgles-omap3 \
-        libgles-omap3-rawdemos \
-        "
-
-MACHINE_EXTRA_INSTALL_emulator = "\
-        llvm3.2 \
-        libegl-mesa \
-        libegl-gallium \
-        libgles2-mesa \
-        mount-vboxsf \
-        "
+MACHINE_EXTRA_INSTALL ?= ""
 
 GSTREAMER_EXTRA_INSTALL = "\
         gst-meta-video \
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
index 58f9a7f..4ff29d0 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
@@ -5,34 +5,7 @@ LICENSE = "CLOSED"
 
 PACKAGES = "${PN}"
 
-MACHINE_EXTRA_INSTALL = ""
-
-MACHINE_EXTRA_INSTALL_raspberrypi = " \
-    vc-graphics-dev \
-    "
-
-MACHINE_EXTRA_INSTALL_mx6 = " \
-    libgal-mx6 \
-    libegl-mx6 \
-    libegl-mx6-dev \
-    libgles2-mx6 \
-    libgles2-mx6-dev \
-    "
-
-MACHINE_EXTRA_INSTALL_mx5 = " \
-    libgsl-fsl-mx51-dev \
-    libegl-mx51-dev \
-    libgles2-mx51-dev \
-    "
-
-MACHINE_EXTRA_INSTALL_beagleboard = "\
-    libgles-omap3-dev \
-    "
-
-MACHINE_EXTRA_INSTALL_emulator = "\
-    libegl-mesa-dev \
-    libgles2-mesa-dev \
-    "
+MACHINE_EXTRA_INSTALL_SDK ?= ""
 
 RDEPENDS_${PN} += "\
     task-core-standalone-sdk-target \
@@ -51,5 +24,5 @@ RDEPENDS_${PN} += "\
     libxslt-dev \
     libudev-dev \
     tslib-dev \
-    ${MACHINE_EXTRA_INSTALL} \
+    ${MACHINE_EXTRA_INSTALL_SDK} \
     "