3 files changed, 28 insertions, 9 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 \
+                        "
diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf
index 1cf893f..a04f2d5 100644
--- a/conf/machine/arria5.conf
+++ b/conf/machine/arria5.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/socfpga.inc
 
-PREFERRED_VERSION_u-boot-socfpga ?= "2016.05%"
+PREFERRED_VERSION_u-boot-socfpga ?= "v2016.11%"
 
 UBOOT_CONFIG ??= "arria5-socdk"
 
@@ -13,7 +13,10 @@ UBOOT_CONFIG[arria5-socdk] = "socfpga_arria5_defconfig"
 KMACHINE = "arria5"
 
 # Default kernel devicetrees
-KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5_socdk.dtb"
+KERNEL_DEVICETREE_arria5 ?= " \
+                                socfpga_arria5_socdk.dtb \
+                                "
 
 # Add support for SDCARD creation
-IMAGE_CLASSES += "image_types_socfpga"
+IMAGE_CLASSES += "sdcard_image-socfpga"
+SOCFPGA_SDIMG_PARTITION_COMMAND = "generate_sdcard_partitions_v2016_11_and_newer"
diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf
index d28fbe7..1c4586e 100644
--- a/conf/machine/cyclone5.conf
+++ b/conf/machine/cyclone5.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/socfpga.inc
 
-PREFERRED_VERSION_u-boot-socfpga ?= "2016.05%"
+PREFERRED_VERSION_u-boot-socfpga ?= "v2016.11%"
 
 UBOOT_CONFIG ??= "cyclone5-socdk"
 
@@ -18,8 +18,14 @@ UBOOT_CONFIG[sr1500] = "socfpga_sr1500_defconfig"
 KMACHINE = "cyclone5"
 
 # Default kernel devicetrees
-KERNEL_DEVICETREE ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb socfpga_cyclone5_de0_sockit.dtb"
+KERNEL_DEVICETREE ?= "\
+                        socfpga_cyclone5_socdk.dtb \
+                        socfpga_cyclone5_sockit.dtb \
+                        socfpga_cyclone5_socrates.dtb \
+                        socfpga_cyclone5_de0_sockit.dtb \
+                        "
 
 # Add support for SDCARD creation
-IMAGE_CLASSES += "image_types_socfpga"
+IMAGE_CLASSES += "sdcard_image-socfpga"
+SOCFPGA_SDIMG_PARTITION_COMMAND = "generate_sdcard_partitions_v2016_11_and_newer"