From 1363460f7a2667048e4188207077b58709214b35 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 17 Oct 2019 14:14:57 +0200 Subject: machines: choose upstream and upstream-rt kernel Signed-off-by: Max Krummenacher (cherry picked from commit 3d68713e7e28fae312fa869f0742a13edf1700c9) --- conf/machine/include/apalis-imx6.inc | 9 ++++++++- conf/machine/include/colibri-imx6.inc | 9 ++++++++- conf/machine/include/colibri-imx6ull.inc | 10 +++++++++- conf/machine/include/colibri-imx7-emmc.inc | 17 +++++++++++++++-- conf/machine/include/colibri-imx7.inc | 18 ++++++++++++++++-- 5 files changed, 56 insertions(+), 7 deletions(-) (limited to 'conf') diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 0e0176c..4afb3bd 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -7,11 +7,18 @@ OFFSET_SPL_PAYLOAD = "138" MACHINE_NAME = "Apalis-iMX6" -PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" +MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" + +MACHINE_BOOT_FILES = "boot.scr" +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" +PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline-rt" +PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_SUFFIX = "img" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 588f8e3..b13d103 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -7,11 +7,18 @@ OFFSET_SPL_PAYLOAD = "138" MACHINE_NAME = "Colibri-iMX6" -PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" +MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" + +MACHINE_BOOT_FILES = "boot.scr" +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" +PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline-rt" +PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_SUFFIX = "img" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 1a10a0f..0bbbff0 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -10,7 +10,15 @@ TORADEX_FLASH_TYPE = "rawnand" MACHINE_NAME = "Colibri-iMX6ULL" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" - UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000" +MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" + +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" +PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline-rt" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 6711a71..12f544d 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -7,10 +7,23 @@ TORADEX_FLASH_TYPE = "emmc" MACHINE_NAME = "Colibri-iMX7-eMMC" -PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" +MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" + +MACHINE_BOOT_FILES = "boot.scr" +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" +PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline-rt" -KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-colibri-emmc-eval-v3.dtb" +KERNEL_DEVICETREE_use-mainline-bsp = " \ + imx7d-colibri-emmc-aster.dtb imx7d-colibri-emmc-eval-v3.dtb \ +" +KERNEL_DEVICETREE_use-mainline-bsp_preempt-rt = " \ + imx7d-colibri-emmc-eval-v3.dtb \ +" + +PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 399ab5a..d56c940 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -8,12 +8,26 @@ TORADEX_FLASH_TYPE = "rawnand" MACHINE_NAME = "Colibri-iMX7" -PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" +MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" + +MACHINE_BOOT_FILES = "boot.scr" +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" +PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline" +PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline-rt" -KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-colibri-eval-v3.dtb imx7s-colibri-eval-v3.dtb" +KERNEL_DEVICETREE_use-mainline-bsp = " \ + imx7d-colibri-aster.dtb imx7d-colibri-eval-v3.dtb \ + imx7s-colibri-aster.dtb imx7s-colibri-eval-v3.dtb \ +" +KERNEL_DEVICETREE_use-mainline-bsp_preempt-rt = " \ + imx7d-colibri-emmc-eval-v3.dtb \ + imx7s-colibri-eval-v3.dtb \ +" +PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx" -- cgit v1.2.3