From 0c6e036fdfec58b69903a10e886a9dfae8fe4c9f Mon Sep 17 00:00:00 2001 From: Dalon Westergreen Date: Wed, 11 Jan 2017 10:16:43 -0800 Subject: Update uboot and kernel recipes, and fix sdcard class (#44) * u-boot-socfpga: update PV for all recipes and add common include for mainline uboot versions u-boot-socfpga versioning scheme varied, some prepended with a 'v' others not. u-boot mainline tags versions with vYYYY.MM so we should be consistent. Create a single include for all mainline uboot versions. Signed-off-by: Dalon Westergreen * u-boot-socfpga: Add support for v2016.11 Signed-off-by: Dalon Westergreen * Update sdcard image class and add to arria5 / cyclone 5 machine conf * Move arria5/cyclone5 to uboot-socfpga v2016.11 Signed-off-by: Dalon Westergreen * Update sdcard script Seemed to be an issue with the rootfs partition being slightly smaller then the ROOTFS_SIZE in some cases. Signed-off-by: Dalon Westergreen * uboot: Cleanup v2014.10 recipe v2014.10 is used for Arria10, at this time it does not support GCC6 which is the default for morty * Clean up arria5 and cyclone5 machine definitions Signed-off-by: Dalon Westergreen * linux-socfpga: add 4.7 and 4.7 dev recipes Signed-off-by: Dalon Westergreen * linux-socfpga: update srcrev for 4.6 kernel and remove 4.6 dev Signed-off-by: Dalon Westergreen * linux-socfpga: delete 4.1 dev as 4.1 is no longer maintained * linux-socfpga: update 4.1.22 srcrev to latest release --- conf/machine/arria10.conf | 16 +++++++++++++--- conf/machine/arria5.conf | 9 ++++++--- conf/machine/cyclone5.conf | 12 +++++++++--- 3 files changed, 28 insertions(+), 9 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3-54-g00ecf