path: root/conf
diff options
authorStefan Agner <>2014-10-20 15:00:00 +0200
committerStefan Agner <>2014-10-20 15:00:00 +0200
commit1691bacdac9d8d7096efb0a7ab319f4a59e7f688 (patch)
tree83282600d22e4692659a8778a9cb7986983b9c4f /conf
parent33558c0f34eebf79937b0d56549a1042e9d146cf (diff)
colibri-vf: switch to zImage inside root fs
Due to U-Boot udpate we need to create one big UBI volume. Since attaching the UBI volume is the expensive operation (compared to mount the UBIFS inside that volume), it is relatively cheep to load the kernel directly from the root filesystems /boot directory instead of creating a own volume for the kernel. This also makes it simpler to load a mainline kernel (along with the required dtb file). However, we loose the integrity check of the uImage. But since there were no measures in place to handle a invalid image, we do not loose functionality here. In case we need integrity check, we should consider switching to the new FIT image format...
Diffstat (limited to 'conf')
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index dd62253..9d4891d 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -11,7 +11,8 @@ require conf/machine/include/
SOC_FAMILY = "vf:vf60"
-PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex-fsl"
PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"