Cleanup stratix10 machine conf and add uboot 2019.07

Cleanup machine conf and add an include for socfgpa_armv8a
in preparation for agilex.

Add initial support for u-boot 2019.07 for S10

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>

2 files changed, 20 insertions, 17 deletions

diff --git a/conf/machine/include/socfpga_armv8a.inc b/conf/machine/include/socfpga_armv8a.inc
new file mode 100644
index 0000000..603f61a
--- /dev/null
+++ b/conf/machine/include/socfpga_armv8a.inc
@@ -0,0 +1,16 @@
+require conf/machine/include/arm/arch-armv8a.inc
+
+KERNEL_PROVIDER ?= "linux-altera"
+PREFERRED_PROVIDER_virtual/kernel ?= "${KERNEL_PROVIDER}"
+KERNEL_IMAGETYPE = "Image"
+MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
+
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga"
+
+SPL_BINARY = "spl/u-boot-spl-dtb.hex"
+UBOOT_SUFFIX = "img"
+UBOOT_BINARY = "u-boot-dtb.img"
+UBOOT_IMAGE = "u-boot-dtb-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+
+IMAGE_FSTYPES ?= "cpio ext3 tar.gz"
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy virtual/kernel:do_deploy"
diff --git a/conf/machine/stratix10.conf b/conf/machine/stratix10.conf
index f6bc970..a3ca1f7 100644
--- a/conf/machine/stratix10.conf
+++ b/conf/machine/stratix10.conf
@@ -2,34 +2,21 @@
 #@NAME: Altera Stratix10
 #@DESCRIPTION: Layer for the Altera Stratix10
 
-require conf/machine/include/arm/arch-armv8a.inc
-
-SPL_BINARY = "spl/u-boot-spl-dtb.bin"
-UBOOT_SUFFIX = "img"
-UBOOT_BINARY = "u-boot-dtb.img"
-UBOOT_IMAGE = "u-boot-dtb-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-socfpga"
-PREFERRED_VERSION_u-boot-socfpga ?= "v2017.09%"
+require conf/machine/include/socfpga_armv8a.inc
 
 UBOOT_CONFIG ??= "stratix10-socdk"
 UBOOT_CONFIG[stratix10-socdk] = "socfpga_stratix10_defconfig"
 
-KERNEL_PROVIDER ?= "linux-altera"
-PREFERRED_PROVIDER_virtual/kernel ?= "${KERNEL_PROVIDER}"
-KERNEL_IMAGETYPE = "Image"
-
 KERNEL_DEVICETREE ?= "altera/socfpga_stratix10_socdk.dtb"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLES ?= "115200;ttyS0"
 
 # Add variables for wic creation of sdcard image
 IMAGE_BOOT_FILES ?= " \
-                        u-boot-dtb.${UBOOT_SUFFIX} \
+                        ${UBOOT_BINARY} \
                         ${KERNEL_IMAGETYPE} \
                         socfpga_stratix10_socdk.dtb \
                     "
 WKS_FILE ?= "sdimage-stratix10.wks"
-do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy virtual/kernel:do_deploy"
+IMAGE_FSTYPES += "wic"
 
-IMAGE_FSTYPES ?= "cpio ext3 tar.gz wic"
-MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"