diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-10-17 14:14:57 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-02-26 10:36:26 +0100 |
commit | 3d68713e7e28fae312fa869f0742a13edf1700c9 (patch) | |
tree | dffd4856fc6258c2785f26defdcd94c56b562b17 /conf | |
parent | 4d9e951cbcc1a69e8678b4ce55cd9b30c8d2089e (diff) |
machines: choose upstream and upstream-rt kernel
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/apalis-imx6.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx6.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx6ull.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx7-emmc.inc | 11 | ||||
-rw-r--r-- | conf/machine/include/colibri-imx7.inc | 13 |
5 files changed, 34 insertions, 2 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 3086519..167c578 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -7,12 +7,16 @@ OFFSET_SPL_PAYLOAD = "138" MACHINE_NAME = "Apalis-iMX6" +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" UBOOT_SUFFIX = "img" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 5977dcd..2abe4af 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -7,12 +7,16 @@ OFFSET_SPL_PAYLOAD = "138" MACHINE_NAME = "Colibri-iMX6" +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" UBOOT_SUFFIX = "img" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 9b510b1..943675f 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -9,8 +9,12 @@ TORADEX_FLASH_TYPE = "rawnand" MACHINE_NAME = "Colibri-iMX6ULL" +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 1503682..cfb652b 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -7,6 +7,8 @@ TORADEX_FLASH_TYPE = "emmc" MACHINE_NAME = "Colibri-iMX7-eMMC" +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" @@ -14,5 +16,12 @@ 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 \ +" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index d1142a2..773c27d 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -8,6 +8,8 @@ TORADEX_FLASH_TYPE = "rawnand" MACHINE_NAME = "Colibri-iMX7" +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" @@ -15,7 +17,16 @@ 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 \ +" UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx" |