From dc20b515e0ea0662972cd6978f67af119ad941cc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 29 May 2020 10:57:12 -0300 Subject: [PATCH] colibri-vf: Fix mainline and NXP BXP support We need to support both mainline and NXP BSP support, to allow that we need: - split generic and NXP BSP specific device trees - avoid setting the default Linux kernel if we use mainline BSP Signed-off-by: Otavio Salvador --- conf/machine/colibri-vf.conf | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index 01e3d2d..6dd737b 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -9,10 +9,19 @@ MACHINEOVERRIDES =. "vf:vf50:vf60:" include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa5.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex" +PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" + KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE += "vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb \ - vf500-colibri-aster.dtb vf610-colibri-aster.dtb" + +KERNEL_DEVICETREE = " \ + vf500-colibri-eval-v3.dtb \ + vf610-colibri-eval-v3.dtb \ +" + +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + vf500-colibri-aster.dtb \ + vf610-colibri-aster.dtb \ +" # U-Boot of our newer release read the Kernel and device tree from static UBI volumes, # hence no need to deploy the kernel binary in the image itself