summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2014-12-12 18:01:08 +0100
committerStefan Agner <stefan.agner@toradex.com>2014-12-16 17:01:46 +0100
commit36f85029a6506d309f32a28d2385689fe90fc72d (patch)
tree760221302fe2c500dff1faeb0c3b0f40f39f5e28 /conf
parent38170e4fe6a6f76d25b650da14ccd9fb62f32233 (diff)
colibri-vf: switch to mainline kernel based on 3.18
Switch default kernel recipe to linux-toradex-vf which will build a kernel based on the toradex 3.18-next branch.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/colibri-vf.conf8
1 files changed, 6 insertions, 2 deletions
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index ed61392..3bc85e3 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -10,8 +10,12 @@ require conf/machine/include/tune-cortexa5.inc
SOC_FAMILY = "vf:vf60"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex-fsl"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex-vf"
KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE += "vf500-colibri-eval-v3.dtb vf610-colibri-eval-v3.dtb"
+
+# U-Boot reads the kernel and device tree directly from rootfs
+IMAGE_INSTALL_append = " kernel-image kernel-devicetree"
PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
@@ -31,7 +35,7 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa"
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
-SERIAL_CONSOLE = "115200 ttymxc0"
+SERIAL_CONSOLE = "115200 ttyLP0"
# don't pull in systemd 216 backported into meta-angstrom
PREFERRED_VERSION_systemd = "211%"