1 files changed, 13 insertions, 3 deletions

diff --git a/conf/machine/arria10.conf b/conf/machine/arria10.conf
index 5cda0eb..d5f3427 100644
--- a/conf/machine/arria10.conf
+++ b/conf/machine/arria10.conf
@@ -4,9 +4,19 @@
 
 require conf/machine/include/socfpga.inc
 
-PREFERRED_VERSION_u-boot-socfpga ?= "2014.10"
-UBOOT_MACHINE = "socfpga_arria10_defconfig"
+PREFERRED_VERSION_u-boot-socfpga ?= "v2014.10%"
 
-KMACHINE = "arria10"
+UBOOT_CONFIG ??= "arria10-socdk"
+
+UBOOT_CONFIG[arria10-socdk] = "socfpga_arria10_defconfig"
+UBOOT_CONFIG[arria10-socdk-nand] = "socfpga_arria10_nand_defconfig"
+UBOOT_CONFIG[arria10-socdk-qspi] = "socfpga_arria10_qspi_defconfig"
 
+KMACHINE = "arria10"
 
+# Default kernel devicetrees
+KERNEL_DEVICETREE ?= "\
+                        socfpga_arria10_socdk_sdmmc.dtb \
+                        socfpga_arria10_socdk_qspi.dtb \
+                        socfpga_arria10_socdk_nand.dts \
+                        "