diff options
| author | Ming Liu <ming.liu@toradex.com> | 2020-04-22 14:32:02 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-18 16:56:01 +0200 |
| commit | f74c7864926f9e40087a84f3df7675f041702e3a (patch) | |
| tree | 0742dc4937f19ebf5ad2f6ff25c563e8c95de667 /conf | |
| parent | 0327feb8d688dd4fcf6c831785b70d6af64eee20 (diff) | |
colibri-imx7: 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.
Drop MACHINE_BOOT_FILES and use the boot file directly, following the
rename of the source file to boot.scr-${MACHINE}.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/colibri-imx7-emmc.inc | 4 | ||||
| -rw-r--r-- | conf/machine/include/colibri-imx7.inc | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 416e7f6..f366b16 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -9,12 +9,12 @@ MACHINE_NAME = "Colibri-iMX7-eMMC" 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" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" +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" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 2df4a18..961f3ac 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -10,8 +10,7 @@ MACHINE_NAME = "Colibri-iMX7" 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" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" @@ -24,11 +23,11 @@ KERNEL_DEVICETREE_append_use-mainline-bsp = " \ imx7d-colibri-aster.dtb \ imx7s-colibri-aster.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" PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline" - PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx" |