summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-12-20 10:56:39 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-12-20 15:51:34 +0100
commitc2c8b8700a0fff2ddd6feda87870cbadb8243b58 (patch)
tree56ef32ad505891e203018e41eff6e2dd3a6eb9eb /conf
parent007649356c8db93ce09c766f4b46ccfaae7025a3 (diff)
apalis-imx6: colibri-imx6ull: fix use-mainline-bsp
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/apalis-imx6.conf4
-rw-r--r--conf/machine/colibri-imx6ull.conf2
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index a9b9af0..221b0b5 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -13,7 +13,6 @@ PREFERRED_PROVIDER_virtual/kernel ??= "linux-toradex"
PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis-ixora.dtb \
imx6q-apalis-ixora-v1.1.dtb"
-KERNEL_DEVICETREE_use-mainline-bsp += "imx6q-apalis-ixora.dtb"
KERNEL_IMAGETYPE = "zImage"
# The kernel lives in a seperate FAT partition, don't deploy it in /boot/
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
@@ -35,4 +34,5 @@ IMAGE_FSTYPES += "tar.xz"
# wic support
WKS_FILE = "sdimage-bootpart.wks"
-MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci"
+MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi \
+ bluetooth 3g pci"
diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf
index 4aaedd6..33e240f 100644
--- a/conf/machine/colibri-imx6ull.conf
+++ b/conf/machine/colibri-imx6ull.conf
@@ -10,10 +10,12 @@ include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa7.inc
PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-toradex-mainline"
KERNEL_DEVICETREE += " \
imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb \
imx6ull-colibri-aster.dtb imx6ull-colibri-wifi-aster.dtb \
"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb"
KERNEL_IMAGETYPE = "zImage"
# The kernel lives in its own ubi volume.
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""