diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-04-20 12:55:29 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-05-12 10:06:07 +0200 |
| commit | aad919e1271e8242af70034fe602608058655576 (patch) | |
| tree | 47921a80b1ba2877d6f112815d4d14308ec6d2d7 /conf | |
| parent | 78b96eef475c1001367d26141c70ec5e9b35be50 (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')
| -rw-r--r-- | conf/machine/apalis-imx6.conf | 2 | ||||
| -rw-r--r-- | conf/machine/colibri-imx6.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf index 23d6528..c0f5fa5 100644 --- a/conf/machine/apalis-imx6.conf +++ b/conf/machine/apalis-imx6.conf @@ -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 = "apalis_imx6q1g_config" +UBOOT_MACHINE = "apalis_imx6_defconfig" SERIAL_CONSOLE = "115200 ttymxc0" 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" |