summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/apalis-imx6.conf2
-rw-r--r--conf/machine/colibri-imx6.conf4
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"