summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-07-19 13:57:24 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2019-09-19 10:50:07 +0200
commit95604a0ff17576e7593c8340f25034c0d77bf097 (patch)
tree4092e874fc767db6126099c3d0ad0c02eaca5de8
parent0d6ec6f2b586a50936910715f2baf762088b21b1 (diff)
machines: specifiy rt kernel
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--conf/machine/apalis-imx8.conf1
-rw-r--r--conf/machine/colibri-imx8x.conf1
-rw-r--r--conf/machine/include/apalis-imx6.inc1
-rw-r--r--conf/machine/include/colibri-imx6.inc1
-rw-r--r--conf/machine/include/colibri-imx6ull.inc2
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc2
-rw-r--r--conf/machine/include/colibri-imx7.inc2
7 files changed, 10 insertions, 0 deletions
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index fadb8d2..c0769bb 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -41,6 +41,7 @@ IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
WKS_FILE_DEPENDS_append = " firmware-imx-8 u-boot-distro-boot"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils"
# Currently we use the nxp 2018.03 downstream for mx8 as some features are
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index 8c40915..95adbca 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -41,6 +41,7 @@ IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils"
# Currently we use the nxp 2018.03 downstream for mx8 as some features are
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index b8435da..b09d1c5 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -12,6 +12,7 @@ IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
KERNEL_IMAGETYPE_${MACHINE} = "zImage"
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
UBOOT_SUFFIX = "img"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index a4a0f9e..a9bd88e 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -12,6 +12,7 @@ IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
KERNEL_IMAGETYPE_${MACHINE} = "zImage"
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
UBOOT_SUFFIX = "img"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 7f04592..9b510b1 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -12,3 +12,5 @@ MACHINE_NAME = "Colibri-iMX6ULL"
MACHINE_BOOT_FILES = "boot.scr"
IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
+
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 477a6b7..1bb879b 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -12,3 +12,5 @@ IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 45bed9c..ebc7a37 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -14,4 +14,6 @@ WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
+
UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx"