summaryrefslogtreecommitdiff
path: root/conf/machine/colibri-imx6.conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2015-04-20 12:55:29 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2015-05-12 10:06:07 +0200
commite2c9128ca6b2a390b45dfb3bfb9da75be803cede (patch)
tree946063b8c82c6d0b1395995ddf48aa69a2fd2934 /conf/machine/colibri-imx6.conf
parenta625ce57ec34439dfdb5c534084de344c33d809f (diff)
Apalis/Colibri iMX6: kernel/U-Boot update to latest in -next
Also deploy an additional device tree supporting a Colibri iMX6 with Analog Camera Module.
Diffstat (limited to 'conf/machine/colibri-imx6.conf')
-rw-r--r--conf/machine/colibri-imx6.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 25c1f36..b9ea652 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -12,7 +12,7 @@ SOC_FAMILY = "mx6:mx6dl"
PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
-KERNEL_DEVICETREE = "imx6dl-colibri-eval-v3.dtb"
+KERNEL_DEVICETREE = "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb"
KERNEL_IMAGETYPE = "uImage"
PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%"
@@ -20,7 +20,7 @@ PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%"
# don't pull in systemd 216 backported into meta-angstrom
PREFERRED_VERSION_systemd = "211%"
-UBOOT_MACHINE = "colibri_imx6s256m_config"
+UBOOT_MACHINE = "colibri_imx6_defconfig"
SERIAL_CONSOLE = "115200 ttymxc0"