diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-21 16:03:21 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-24 13:24:49 +0200 |
commit | 4120fbde76371e0445956c0b5b79a15cc20cd986 (patch) | |
tree | 373ead2f96dcc0c376a8bdbbce480eec1ddfa9b6 | |
parent | 973b13ee9af90502d3f9fdeb84d3e7d4ecc5d0ea (diff) | |
download | meta-boot2qt-4120fbde76371e0445956c0b5b79a15cc20cd986.tar.gz |
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>
-rw-r--r-- | conf/distro/b2qt.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/am335x-evm.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/apalis-imx6.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/beagleboard.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/beaglebone.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/imx53qsb.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/imx6qsabresd.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/nitrogen6x.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/raspberrypi.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/tibidabo.conf | 4 |
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 ?= "" | |||
51 | MACHINE_EXTRA_INSTALL_SDK ?= "" | 51 | MACHINE_EXTRA_INSTALL_SDK ?= "" |
52 | MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" | 52 | MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" |
53 | 53 | ||
54 | IMAGE_FSTYPES ?= "tar.gz" | ||
55 | |||
54 | LICENSE_CREATE_PACKAGE = "1" | 56 | LICENSE_CREATE_PACKAGE = "1" |
55 | COPY_LIC_MANIFEST = "1" | 57 | COPY_LIC_MANIFEST = "1" |
56 | 58 | ||
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 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | IMAGE_FSTYPES = "tar.gz" | ||
24 | |||
25 | BOOTFS_CONTENT = "\ | 23 | BOOTFS_CONTENT = "\ |
26 | u-boot-${MACHINE}.img:u-boot.img \ | 24 | u-boot-${MACHINE}.img:u-boot.img \ |
27 | MLO-${MACHINE}:MLO \ | 25 | 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 @@ | |||
22 | 22 | ||
23 | include conf/distro/include/toradex.inc | 23 | include conf/distro/include/toradex.inc |
24 | 24 | ||
25 | IMAGE_FSTYPES = "tar.gz" | ||
26 | |||
27 | BOOTFS_CONTENT = "\ | 25 | BOOTFS_CONTENT = "\ |
28 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 26 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
29 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ | 27 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ |
@@ -47,7 +45,5 @@ MACHINE_EXTRA_INSTALL_SDK = " \ | |||
47 | libgles2-mx6-dev \ | 45 | libgles2-mx6-dev \ |
48 | " | 46 | " |
49 | 47 | ||
50 | ADB_PRODUCTID = "0x0000" | ||
51 | |||
52 | SERIAL_CONSOLES = "115200;ttymxc0 \ | 48 | SERIAL_CONSOLES = "115200;ttymxc0 \ |
53 | 115200;ttymxc1" | 49 | 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 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | IMAGE_FSTYPES = "tar.gz" | ||
24 | |||
25 | BOOTFS_CONTENT = "\ | 23 | BOOTFS_CONTENT = "\ |
26 | u-boot-${MACHINE}.img:u-boot.img \ | 24 | u-boot-${MACHINE}.img:u-boot.img \ |
27 | MLO-${MACHINE}:MLO \ | 25 | 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 @@ | |||
15 | ## contact form at http://qt.digia.com | 15 | ## contact form at http://qt.digia.com |
16 | ## | 16 | ## |
17 | ############################################################################ | 17 | ############################################################################ |
18 | IMAGE_FSTYPES = "tar.gz" | ||
19 | |||
20 | BOOTFS_CONTENT = "\ | 18 | BOOTFS_CONTENT = "\ |
21 | u-boot-${MACHINE}.img:u-boot.img \ | 19 | u-boot-${MACHINE}.img:u-boot.img \ |
22 | MLO-${MACHINE}:MLO \ | 20 | 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 @@ | |||
22 | 22 | ||
23 | include conf/distro/include/toradex.inc | 23 | include conf/distro/include/toradex.inc |
24 | 24 | ||
25 | IMAGE_FSTYPES = "tar.gz" | ||
26 | |||
27 | BOOTFS_CONTENT = "\ | 25 | BOOTFS_CONTENT = "\ |
28 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 26 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
29 | u-boot-${MACHINE}.imx:u-boot.imx \ | 27 | u-boot-${MACHINE}.imx:u-boot.imx \ |
30 | " | 28 | " |
31 | BOOTFS_DEPENDS = "u-boot:do_deploy" | 29 | BOOTFS_DEPENDS = "u-boot:do_deploy" |
32 | 30 | ||
33 | ADB_PRODUCTID = "0x0000" | ||
34 | |||
35 | SERIAL_CONSOLES = "115200;ttymxc0 \ | 31 | SERIAL_CONSOLES = "115200;ttymxc0 \ |
36 | 115200;ttymxc1" | 32 | 115200;ttymxc1" |
37 | 33 | ||
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 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | IMAGE_FSTYPES = "tar.gz" | ||
24 | |||
25 | BOOTFS_CONTENT = "\ | 23 | BOOTFS_CONTENT = "\ |
26 | u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ | 24 | u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ |
27 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 25 | ${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 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | IMAGE_FSTYPES = "tar.gz ext3 sdcard" | ||
24 | |||
25 | BOOTFS_CONTENT = "\ | 23 | BOOTFS_CONTENT = "\ |
26 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 24 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
27 | ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ | 25 | ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ |
@@ -69,5 +67,3 @@ KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp. | |||
69 | imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \ | 67 | imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \ |
70 | " | 68 | " |
71 | MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" | 69 | MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" |
72 | |||
73 | 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 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | IMAGE_FSTYPES = "tar.gz" | ||
24 | |||
25 | BOOTFS_CONTENT = "\ | 23 | BOOTFS_CONTENT = "\ |
26 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 24 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
27 | ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ | 25 | ${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 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | IMAGE_FSTYPES = "tar.gz" | ||
24 | |||
25 | BOOTFS_CONTENT = "\ | 23 | BOOTFS_CONTENT = "\ |
26 | bcm2835-bootfiles/*: \ | 24 | bcm2835-bootfiles/*: \ |
27 | ${KERNEL_IMAGETYPE}:kernel.img \ | 25 | ${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 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | IMAGE_FSTYPES = "tar.gz" | ||
24 | |||
25 | BOOTFS_CONTENT = "\ | 23 | BOOTFS_CONTENT = "\ |
26 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 24 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
27 | bootscript:bootscript \ | 25 | bootscript:bootscript \ |
@@ -45,6 +43,4 @@ MACHINE_EXTRA_INSTALL_SDK = " \ | |||
45 | 43 | ||
46 | module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture" | 44 | module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture" |
47 | 45 | ||
48 | ADB_PRODUCTID = "0x0000" | ||
49 | |||
50 | BBMASK += "|meta-fsl-extras/recipes/u-boot|meta-fsl-extras/recipes/linux/linux-boundary|meta-fsl-extras/recipes/broadcom-nvram-config" | 46 | BBMASK += "|meta-fsl-extras/recipes/u-boot|meta-fsl-extras/recipes/linux/linux-boundary|meta-fsl-extras/recipes/broadcom-nvram-config" |