diff options
author | Ming Liu <ming.liu@toradex.com> | 2020-04-22 14:28:48 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-18 16:56:01 +0200 |
commit | 984f7ec2f224c63cb5577854c0200d6cad2f6de1 (patch) | |
tree | 437bf66a47028082a5c0c56a7590bb5b860398b6 /conf | |
parent | 36a2dc8f578f0f797a7bb992d0ad6992b9227aff (diff) |
colibri-imx6: follow IMX_DEFAULT_BSP change
IMX_DEFAULT_BSP set in the distro decides on use-mainline-bsp and sets
the override in imx-base.conf.
Set PREFERRED_PROVIDER_virtual/kernel accordingly in apalis-imx6.inc.
Drop MACHINE_BOOT_FILES and use the boot file directly, following the
rename of the source file to boot.scr-${MACHINE}.
Also drop a redundant KERNEL_IMAGETYPE definition.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/colibri-imx6.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index b094cc1..b105b4d 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -7,14 +7,11 @@ 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}" +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" WKS_FILE_DEPENDS_append = " u-boot-distro-boot" -KERNEL_IMAGETYPE_${MACHINE} = "zImage" KERNEL_DEVICETREE += "imx6dl-colibri-iris.dtb imx6dl-colibri-iris-v2.dtb" +PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline" |