diff options
| author | Ming Liu <ming.liu@toradex.com> | 2020-04-22 14:26:21 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-18 16:56:01 +0200 |
| commit | 36a2dc8f578f0f797a7bb992d0ad6992b9227aff (patch) | |
| tree | 71f144a9241559e88bd9132011bc08c99e97aa3f /conf | |
| parent | 0f0bff2aba1a6805fc17b3a572705c362bca55fa (diff) | |
apalis-imx6.conf: 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/apalis-imx6.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 2d814b4..7f340b7 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -7,19 +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}" +IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr" WKS_FILE_DEPENDS_append = " u-boot-distro-boot" -KERNEL_IMAGETYPE_${MACHINE} = "zImage" KERNEL_DEVICETREE += "imx6q-apalis-ixora-v1.2.dtb" KERNEL_DEVICETREE_use-mainline-bsp += " \ imx6q-apalis-eval.dtb \ imx6q-apalis-ixora-v1.1.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" |