diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index 79898f473..330c8b4a7 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -6,7 +6,12 @@
 include conf/machine/include/ccimx6.inc
 
 # U-Boot configurations
-UBOOT_CONFIG ??= "ccimx6qsbc"
+# Last one is the default (the one the symlinks point at)
+UBOOT_CONFIG ??= "ccimx6dlsbc256MB ccimx6dlsbc512MB ccimx6dlsbc ccimx6qsbc512MB ccimx6qsbc"
+UBOOT_CONFIG[ccimx6dlsbc256MB] = "ccimx6dlsbc256MB_config"
+UBOOT_CONFIG[ccimx6dlsbc512MB] = "ccimx6dlsbc512MB_config"
+UBOOT_CONFIG[ccimx6dlsbc] = "ccimx6dlsbc_config"
+UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_config"
 UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_config"
 
 KERNEL_DEVICETREE = " \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils_2013.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils_2013.04.bb
index 586c55605..d9141950b 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils_2013.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils_2013.04.bb
@@ -12,6 +12,17 @@ SRC_URI += " \
 
 S = "${WORKDIR}/git"
 
+#
+# In a u-boot multiconfig case, UBOOT_MACHINE has multiple values. Using
+# parallel build leads to build failures:
+#
+#   ln: failed to create symbolic link 'asm/arch/arch-mx6': File exists
+#   ln: failed to create symbolic link 'asm/arch': No such file or directory
+#
+# Without parallel make, UBOOT_MACHINE's last entry is used to configure uboot
+#
+PARALLEL_MAKE = ""
+
 EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
 
 inherit uboot-config