From c961a44b5f4b713bb77831cfbdc19bca8746401a Mon Sep 17 00:00:00 2001
From: Dalon Westergreen <dalon.westergreen@intel.com>
Date: Mon, 30 Jan 2017 22:13:57 -0800
Subject: Add extlinux to sdcard creation

exlinux.conf should be copied to the bootable fat partition
so that distro boot in uboot can find it.
---
 classes/sdcard_image-socfpga.bbclass | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/classes/sdcard_image-socfpga.bbclass b/classes/sdcard_image-socfpga.bbclass
index b7d524e..0b845a2 100644
--- a/classes/sdcard_image-socfpga.bbclass
+++ b/classes/sdcard_image-socfpga.bbclass
@@ -68,10 +68,10 @@ generate_sdcard_partitions () {
 	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})
+	# set fat partition as bootable for distroboot
+	parted -s ${SDIMG} set 1 boot on
 	# 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})
-	# set linux partition as bootable for distroboot
-	parted -s ${SDIMG} set 2 boot on
 	# P3: A2 partition for bootloader
 	parted -s ${SDIMG} unit KiB mkpart primary ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
 
@@ -128,6 +128,19 @@ IMAGE_CMD_socfpga-sdimg () {
 		done
 	fi
 
+	# copy extlinux stuff
+	if [ "${UBOOT_EXTLINUX}" = "1" ]
+	then
+		if [ -e "${DEPLOY_DIR_IMAGE}/extlinux.conf" ]
+		then
+			rm -Rf ${WORKDIR}/extlinux
+			mkdir ${WORKDIR}/extlinux
+			cp ${DEPLOY_DIR_IMAGE}/extlinux.conf ${WORKDIR}/extlinux/
+			mcopy -i ${WORKDIR}/fat.img -s ${WORKDIR}/extlinux ::/
+		fi
+		
+	fi
+
 	# Add stamp file
 	echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
 	mcopy -i ${WORKDIR}/fat.img -v ${WORKDIR}//image-version-info ::
-- 
cgit v1.2.3-54-g00ecf