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 <dwesterg@gmail.com>

* u-boot-socfpga: Add support for v2016.11

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

* 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 <dwesterg@gmail.com>

* 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 <dalon.westergreen@intel.com>

* 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 <dalon.westergreen@intel.com>

* linux-socfpga: add 4.7 and 4.7 dev recipes

Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>

* linux-socfpga: update srcrev for 4.6 kernel and remove 4.6 dev

Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>

* linux-socfpga: delete 4.1 dev as 4.1 is no longer maintained

* linux-socfpga: update 4.1.22 srcrev to latest release

2 files changed, 172 insertions, 124 deletions

diff --git a/classes/image_types_socfpga.bbclass b/classes/image_types_socfpga.bbclass
deleted file mode 100644
index 860752e..0000000
--- a/classes/image_types_socfpga.bbclass
+++ /dev/null
@@ -1,124 +0,0 @@
-inherit image_types
-
-SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3"
-
-# Boot partition size [in KiB]
-IMAGE_ROOTFS_ALIGNMENT_cyclone5 ?= "2048"
-IMAGE_ROOTFS_ALIGNMENT_arria5 ?= "2048"
-
-BOOT_SPACE ?= "102400"
-
-IMAGE_DEPENDS_sdcard = "parted-native:do_populate_sysroot \
-                        dosfstools-native:do_populate_sysroot \
-                        mtools-native:do_populate_sysroot \
-                        virtual/kernel:do_deploy \
-                        virtual/bootloader:do_deploy"
-
-SDCARD_GENERATION_COMMAND_cyclone5 = "generate_28nm_sdcard"
-SDCARD_GENERATION_COMMAND_arria5 = "generate_28nm_sdcard"
-
-#
-# Generate the boot image with the boot scripts and required Device Tree
-# files
-_generate_boot_image() {
-        local boot_part=$1
-
-        # Create boot partition image
-        BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \
-                          | awk "/ $boot_part / { print substr(\$4, 1, length(\$4 -1)) / 1024 }")
-
-        # mkdosfs will sometimes use FAT16 when it is not appropriate,
-        # resulting in a boot failure from SYSLINUX. Use FAT32 for
-        # images larger than 512MB, otherwise let mkdosfs decide.
-        if [ $(expr $BOOT_BLOCKS / 1024) -gt 512 ]; then
-                FATSIZE="-F 32"
-        fi
-
-        rm -f ${WORKDIR}/boot.img
-        mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 ${FATSIZE} -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-
-        mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE}
-
-        # Copy boot scripts
-        for item in ${BOOT_SCRIPTS}; do
-                src=`echo $item | awk -F':' '{ print $1 }'`
-                dst=`echo $item | awk -F':' '{ print $2 }'`
-
-                mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$src ::/$dst
-        done
-
-        # Copy device tree file
-        if test -n "${KERNEL_DEVICETREE}"; then
-                for DTS_FILE in ${KERNEL_DEVICETREE}; do
-                        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
-                        if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then
-                                kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`"
-                                kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`"
-                                if [ $kernel_bin = $kernel_bin_for_dtb ]; then
-                                        mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_BASE_NAME}.dtb
-                                fi
-                        else
-                                bbfatal "${DTS_FILE} does not exist."
-                        fi
-                done
-        fi
-}
-
-generate_28nm_sdcard () {
-        # Create partition table
-        parted -s ${SDCARD} mklabel msdos
-        parted -s ${SDCARD} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED})
-        parted -s ${SDCARD} unit KiB mkpart primary $(expr  ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE)
-        parted -s ${SDCARD} unit KiB mkpart primary 1024 2048
-
-        #set part 3 to type a2 for spl / uboot image
-        echo -ne "\xa2" | dd of=${SDCARD} bs=1 count=1 seek=482 conv=notrunc
-
-
-        if [ -e "${DEPLOY_DIR_IMAGE}/${SPL_BINARY}-${UBOOT_CONFIG}" ]
-        then
-            dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY}-${UBOOT_CONFIG} of=${SDCARD} conv=notrunc seek=1 bs=$(expr 1024 \* 1024)
-        elif [ -e "${DEPLOY_DIR_IMAGE}/${SPL_BINARY}-${UBOOT_CONFIG}" ]
-        then
-            dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDCARD} conv=notrunc seek=1 bs=$(expr 1024 \* 1024)
-        else
-            bbfatal "${SPL_BINARY} does not exist."
-        fi
-
-        parted ${SDCARD} print
-
-        _generate_boot_image 1
-        # Burn Partition
-        dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
-        dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc,fsync seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
-}
-
-IMAGE_CMD_sdcard () {
-        if [ -z "${SDCARD_ROOTFS}" ]; then
-                bberror "SDCARD_ROOTFS is undefined. To use sdcard image from Freescale's BSP it needs to be defined."
-                exit 1
-        fi
-
-        # Align boot partition and calculate total SD card image size
-        BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
-        BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-        SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT})
-
-        # Initialize a sparse file
-        if [ "x${UBOOT_CONFIG}" != "x" ]
-        then
-                SDCARD_NAME="${IMAGE_NAME}-${UBOOT_CONFIG}.rootfs.sdcard"
-        else
-                SDCARD_NAME="${IMAGE_NAME}.rootfs.sdcard"
-        fi
-        SDCARD="${DEPLOY_DIR_IMAGE}/${SDCARD_NAME}"
-        dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE})
-        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.sdcard
-        ln -s ${SDCARD_NAME} ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.sdcard
-
-        ${SDCARD_GENERATION_COMMAND}
-}
-
-# The sdcard requires the rootfs filesystem to be built before using
-# it so we must make this dependency explicit.
-IMAGE_TYPEDEP_sdcard = "${@d.getVar('SDCARD_ROOTFS', 1).split('.')[-1]}"
diff --git a/classes/sdcard_image-socfpga.bbclass b/classes/sdcard_image-socfpga.bbclass
new file mode 100644
index 0000000..0f59957
--- /dev/null
+++ b/classes/sdcard_image-socfpga.bbclass
@@ -0,0 +1,172 @@
+inherit image_types
+
+# Create an sdcard image suitable for the atlas board
+# This is copied from the raspberrypi and freescale sdcard classes
+
+# Disk layout
+#    0                      -> 8*1024                           - reserverd
+#    8*1024                 -> 32*1024                          - 
+#    32*1024                -> 1024*1024                        - 
+#    1024*1024              -> BOOT_SPACE                       - bootloader and kernel in Part 3
+#    BOOT_SPACE*1024        -> FAT_SPACE
+
+
+
+# This image depends on the rootfs image
+IMAGE_TYPEDEP_socfpga-sdimg = "${SDIMG_ROOTFS_TYPE}"
+
+# Boot partition volume id
+BOOTDD_VOLUME_ID ?= "${MACHINE}"
+
+# Boot partition size [in KiB] -> size 2M for A10
+BOOT_SPACE ?= "2048"
+
+# Fat partition size
+FAT_SPACE ?= "102400"
+
+# Boot partition begin at sector 1024
+# This is required as for c5/a5 mainline uboot hard codes the location
+# of the uboot image in the sdcard to 0xa00 sector
+IMAGE_ROOTFS_ALIGNMENT = "1024"
+
+# ROOTFS_SIZE_MOD ?= "524288"
+ROOTFS_SIZE_MOD ?= "16384"
+
+# Use an uncompressed ext3 by default as rootfs
+SDIMG_ROOTFS_TYPE = "ext3"
+SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
+
+
+IMAGE_DEPENDS_socfpga-sdimg += " \
+                        parted-native \
+                        mtools-native \
+                        dosfstools-native \
+                        virtual/kernel \
+                        virtual/bootloader \
+                        "
+                        
+rootfs[depends] += "virtual/kernel:do_deploy"
+
+# SD card image name
+SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.socfpga-sdimg"
+
+IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
+
+# After uboot v2016.05 the boot partition number was changed from 3 to 1 so as a
+# result we need 2 different functions for creating the boot partitions just to
+# change the partition creation order
+
+SOCFPGA_SDIMG_PARTITION_COMMAND ?= "generate_sdcard_partitions_v2016_05_and_earlier"
+
+generate_sdcard_partitions_v2016_05_and_earlier () {
+
+        # Create partition table
+        parted -s ${SDIMG} mklabel msdos
+        # P1: Fat partition
+        parted -s ${SDIMG} unit KiB mkpart primary fat32 $(expr  ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ ${FAT_SPACE_ALIGNED})
+        # P2: Linux FS partition
+        parted -s ${SDIMG} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ ${FAT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ ${FAT_SPACE_ALIGNED} \+ ${ROOTFS_SIZE_ALIGNED})
+        # P3: A2 partition for bootloader
+        parted -s ${SDIMG} unit KiB mkpart primary ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
+
+        # set part 3 to type a2 for spl / uboot image
+        # 446 to partition table, 16 bytes per entry, 4 byte offset to partition type
+        echo -ne "\xa2" | dd of=${SDIMG} bs=1 count=1 seek=$(expr 446 + 16 + 16 + 4) conv=notrunc && sync && sync
+        
+        # Create a vfat image with boot files
+        FAT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
+        rm -f ${WORKDIR}/fat.img
+        mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/fat.img $FAT_BLOCKS
+        
+}
+
+generate_sdcard_partitions_v2016_11_and_newer () {
+
+        # Create partition table
+        parted -s ${SDIMG} mklabel msdos
+        # P1: A2 partition for bootloader
+        parted -s ${SDIMG} unit KiB mkpart primary ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
+        # P2: Fat partition
+        parted -s ${SDIMG} unit KiB mkpart primary fat32 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ ${FAT_SPACE_ALIGNED})
+        # P3: Linux FS partition
+#       parted -s ${SDIMG} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ ${FAT_SPACE_ALIGNED}) $(expr ${BOOT_SPACE_ALIGNED} \+ ${FAT_SPACE_ALIGNED} \+ ${ROOTFS_SIZE_ALIGNED})
+        parted -s ${SDIMG} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ ${FAT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ ${FAT_SPACE_ALIGNED} \+ ${ROOTFS_SIZE_ALIGNED})
+        
+        # set part 1 to type a2 for spl / uboot image
+        # 446 to partition table, 16 bytes per entry, 4 byte offset to partition type
+        echo -ne "\xa2" | dd of=${SDIMG} bs=1 count=1 seek=$(expr 446 + 4) conv=notrunc && sync && sync
+        
+        # Create a vfat image with boot files
+        FAT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
+        rm -f ${WORKDIR}/fat.img
+        mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/fat.img $FAT_BLOCKS
+        
+}
+
+IMAGE_CMD_socfpga-sdimg () {
+
+        # Align partitions
+        BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
+        BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
+        FAT_SPACE_ALIGNED=$(expr ${FAT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)  
+        FAT_SPACE_ALIGNED=$(expr ${FAT_SPACE_ALIGNED} - ${FAT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
+        
+        ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE} \+ ${ROOTFS_SIZE_MOD})
+        ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE_ALIGNED} \- ${ROOTFS_SIZE_ALIGNED} \% ${ROOTFS_SIZE_MOD})
+        
+        SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + ${FAT_SPACE_ALIGNED} + ${ROOTFS_SIZE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT})
+        
+        # Initialize sdcard image file
+        dd if=/dev/zero of=${SDIMG} bs=1 count=0 seek=$(expr 1024 \* ${SDIMG_SIZE}) && sync && sync
+        
+        # Create partition table
+        ${SOCFPGA_SDIMG_PARTITION_COMMAND}
+
+        # Copy kernel image
+        mcopy -i ${WORKDIR}/fat.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE}
+        
+        # Copy boot scripts
+        if [ -e "${DEPLOY_DIR_IMAGE}/${MACHINE}.scr" ]
+        then
+                mcopy -i ${WORKDIR}/fat.img -s ${DEPLOY_DIR_IMAGE}/${MACHINE}.scr ::/u-boot.scr
+        fi
+        
+        # Copy device tree file
+        if test -n "${KERNEL_DEVICETREE}"; then
+                for DTS_FILE in ${KERNEL_DEVICETREE}; do
+                        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+                        if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then
+                                kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`"
+                                kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`"
+                                if [ $kernel_bin = $kernel_bin_for_dtb ]; then
+                                        mcopy -i ${WORKDIR}/fat.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_BASE_NAME}.dtb
+                                fi
+                        fi
+                done
+        fi
+
+        # Add stamp file
+        echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
+        mcopy -i ${WORKDIR}/fat.img -v ${WORKDIR}//image-version-info ::
+
+        # Burn Partitions
+        dd if=${WORKDIR}/fat.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+        # If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
+        if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
+        then
+                xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + 1024 \* ${FAT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+        else
+                dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + 1024 \* ${FAT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+        fi
+
+        if [ -e "${DEPLOY_DIR_IMAGE}/${SPL_BINARY}-${UBOOT_CONFIG}" ]
+        then
+            dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY}-${UBOOT_CONFIG} of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+        elif [ -e "${DEPLOY_DIR_IMAGE}/${SPL_BINARY}" ]
+        then
+            dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+        else
+            bbfatal "${SPL_BINARY} does not exist."
+        fi      
+        
+}