Use machine includes

Change-Id: I50f84cb6c8f548a7d4909e521825c9b1bae86d52
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>

4 files changed, 18 insertions, 13 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index e1d8352..e4a10d5 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -12,11 +12,7 @@ SANITY_TESTED_DISTROS += " \
             LinuxMint-14 \n \
             "
 
-include conf/distro/include/image_type.conf
-
-PREFERRED_PROVIDER_virtual/libgl_omap3 = "libgles-omap3"
-PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
-PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
+include conf/distro/include/${MACHINE}.conf
 
 SYSVINIT_ENABLED_GETTYS = ""
 
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
new file mode 100644
index 0000000..8586774
--- /dev/null
+++ b/conf/distro/include/beagleboard.conf
@@ -0,0 +1,13 @@
+include conf/distro/include/image_type.conf
+
+BOOT_SCRIPTS = "\
+        u-boot-${MACHINE}.img:u-boot.img \
+        MLO-${MACHINE}:MLO \
+        "
+SDCARD_GENERATION_COMMAND = "generate_imx_sdcard"
+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"
+
diff --git a/conf/distro/include/image_type.conf b/conf/distro/include/image_type.conf
index 596551b..b98fdd1 100644
--- a/conf/distro/include/image_type.conf
+++ b/conf/distro/include/image_type.conf
@@ -4,11 +4,3 @@ IMAGE_CLASSES += "image_types_sdcard"
 IMAGE_ROOTFS_EXTRA_SPACE = "300000"
 SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
 
-BOOT_SCRIPTS_mx6 = "6x_bootscript-${MACHINE}:6x_bootscript"
-
-BOOT_SCRIPTS_beagleboard = "\
-        u-boot-${MACHINE}.img:u-boot.img \
-        MLO-${MACHINE}:MLO \
-        "
-SDCARD_GENERATION_COMMAND_beagleboard = "generate_imx_sdcard"
-UBOOT_SUFFIX_beagleboard = "img"
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
new file mode 100644
index 0000000..7bfb8c2
--- /dev/null
+++ b/conf/distro/include/nitrogen6x.conf
@@ -0,0 +1,4 @@
+include conf/distro/include/image_type.conf
+
+BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
+