Minor cleanup for device confs

Every device does not need to define IMAGE_FSTYPES and ADB_PRODUCTID.

Change-Id: I05d255727a6fb533850069dc7513c06d06a995b4
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>

11 files changed, 2 insertions, 28 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index d0230a1..7e6cd0c 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -51,6 +51,8 @@ MACHINE_EXTRA_INSTALL ?= ""
 MACHINE_EXTRA_INSTALL_SDK ?= ""
 MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
 
+IMAGE_FSTYPES ?= "tar.gz"
+
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
 
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 6772a2a..ad651e7 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 53901a1..536e389 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -22,8 +22,6 @@
 
 include conf/distro/include/toradex.inc
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \
@@ -47,7 +45,5 @@ MACHINE_EXTRA_INSTALL_SDK = " \
         libgles2-mx6-dev \
         "
 
-ADB_PRODUCTID = "0x0000"
-
 SERIAL_CONSOLES = "115200;ttymxc0 \
                    115200;ttymxc1"
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index dab9c68..88b9b8a 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index e7b1d05..3bbb29f 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -15,8 +15,6 @@
 ## contact form at http://qt.digia.com
 ##
 ############################################################################
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index c5a3343..fd7683d 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -22,16 +22,12 @@
 
 include conf/distro/include/toradex.inc
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     u-boot-${MACHINE}.imx:u-boot.imx \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy"
 
-ADB_PRODUCTID = "0x0000"
-
 SERIAL_CONSOLES = "115200;ttymxc0 \
                    115200;ttymxc1"
 
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index a7099a5..a4eb47d 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index accd566..7e9b5b6 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz ext3 sdcard"
-
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \
@@ -69,5 +67,3 @@ KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.
                      imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
                     "
 MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
-
-ADB_PRODUCTID = "0x0000"
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index b2a56f2..d0b264a 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index d0a400e..6a785d5 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     bcm2835-bootfiles/*: \
     ${KERNEL_IMAGETYPE}:kernel.img \
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index 11d6a1c..1c4550d 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz"
-
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     bootscript:bootscript \
@@ -45,6 +43,4 @@ MACHINE_EXTRA_INSTALL_SDK = " \
 
 module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture"
 
-ADB_PRODUCTID = "0x0000"
-
 BBMASK += "|meta-fsl-extras/recipes/u-boot|meta-fsl-extras/recipes/linux/linux-boundary|meta-fsl-extras/recipes/broadcom-nvram-config"