diff options
author | Dalon Westergreen <dalon.westergreen@intel.com> | 2017-01-11 10:16:43 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2017-01-11 10:16:43 -0800 |
commit | 0c6e036fdfec58b69903a10e886a9dfae8fe4c9f (patch) | |
tree | d20289b0fe29ddea1e637248a68e2d0f7c20a89e /classes/image_types_socfpga.bbclass | |
parent | ab2ee2812670be650d6a722de08dff9bf05131f8 (diff) | |
download | meta-altera-0c6e036fdfec58b69903a10e886a9dfae8fe4c9f.tar.gz |
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
Diffstat (limited to 'classes/image_types_socfpga.bbclass')
-rw-r--r-- | classes/image_types_socfpga.bbclass | 124 |
1 files changed, 0 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 @@ | |||
1 | inherit image_types | ||
2 | |||
3 | SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3" | ||
4 | |||
5 | # Boot partition size [in KiB] | ||
6 | IMAGE_ROOTFS_ALIGNMENT_cyclone5 ?= "2048" | ||
7 | IMAGE_ROOTFS_ALIGNMENT_arria5 ?= "2048" | ||
8 | |||
9 | BOOT_SPACE ?= "102400" | ||
10 | |||
11 | IMAGE_DEPENDS_sdcard = "parted-native:do_populate_sysroot \ | ||
12 | dosfstools-native:do_populate_sysroot \ | ||
13 | mtools-native:do_populate_sysroot \ | ||
14 | virtual/kernel:do_deploy \ | ||
15 | virtual/bootloader:do_deploy" | ||
16 | |||
17 | SDCARD_GENERATION_COMMAND_cyclone5 = "generate_28nm_sdcard" | ||
18 | SDCARD_GENERATION_COMMAND_arria5 = "generate_28nm_sdcard" | ||
19 | |||
20 | # | ||
21 | # Generate the boot image with the boot scripts and required Device Tree | ||
22 | # files | ||
23 | _generate_boot_image() { | ||
24 | local boot_part=$1 | ||
25 | |||
26 | # Create boot partition image | ||
27 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ | ||
28 | | awk "/ $boot_part / { print substr(\$4, 1, length(\$4 -1)) / 1024 }") | ||
29 | |||
30 | # mkdosfs will sometimes use FAT16 when it is not appropriate, | ||
31 | # resulting in a boot failure from SYSLINUX. Use FAT32 for | ||
32 | # images larger than 512MB, otherwise let mkdosfs decide. | ||
33 | if [ $(expr $BOOT_BLOCKS / 1024) -gt 512 ]; then | ||
34 | FATSIZE="-F 32" | ||
35 | fi | ||
36 | |||
37 | rm -f ${WORKDIR}/boot.img | ||
38 | mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 ${FATSIZE} -C ${WORKDIR}/boot.img $BOOT_BLOCKS | ||
39 | |||
40 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE} | ||
41 | |||
42 | # Copy boot scripts | ||
43 | for item in ${BOOT_SCRIPTS}; do | ||
44 | src=`echo $item | awk -F':' '{ print $1 }'` | ||
45 | dst=`echo $item | awk -F':' '{ print $2 }'` | ||
46 | |||
47 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$src ::/$dst | ||
48 | done | ||
49 | |||
50 | # Copy device tree file | ||
51 | if test -n "${KERNEL_DEVICETREE}"; then | ||
52 | for DTS_FILE in ${KERNEL_DEVICETREE}; do | ||
53 | DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` | ||
54 | if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then | ||
55 | kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`" | ||
56 | 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"`" | ||
57 | if [ $kernel_bin = $kernel_bin_for_dtb ]; then | ||
58 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_BASE_NAME}.dtb | ||
59 | fi | ||
60 | else | ||
61 | bbfatal "${DTS_FILE} does not exist." | ||
62 | fi | ||
63 | done | ||
64 | fi | ||
65 | } | ||
66 | |||
67 | generate_28nm_sdcard () { | ||
68 | # Create partition table | ||
69 | parted -s ${SDCARD} mklabel msdos | ||
70 | parted -s ${SDCARD} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) | ||
71 | parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} \+ $ROOTFS_SIZE) | ||
72 | parted -s ${SDCARD} unit KiB mkpart primary 1024 2048 | ||
73 | |||
74 | #set part 3 to type a2 for spl / uboot image | ||
75 | echo -ne "\xa2" | dd of=${SDCARD} bs=1 count=1 seek=482 conv=notrunc | ||
76 | |||
77 | |||
78 | if [ -e "${DEPLOY_DIR_IMAGE}/${SPL_BINARY}-${UBOOT_CONFIG}" ] | ||
79 | then | ||
80 | dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY}-${UBOOT_CONFIG} of=${SDCARD} conv=notrunc seek=1 bs=$(expr 1024 \* 1024) | ||
81 | elif [ -e "${DEPLOY_DIR_IMAGE}/${SPL_BINARY}-${UBOOT_CONFIG}" ] | ||
82 | then | ||
83 | dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDCARD} conv=notrunc seek=1 bs=$(expr 1024 \* 1024) | ||
84 | else | ||
85 | bbfatal "${SPL_BINARY} does not exist." | ||
86 | fi | ||
87 | |||
88 | parted ${SDCARD} print | ||
89 | |||
90 | _generate_boot_image 1 | ||
91 | # Burn Partition | ||
92 | dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) | ||
93 | dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc,fsync seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) | ||
94 | } | ||
95 | |||
96 | IMAGE_CMD_sdcard () { | ||
97 | if [ -z "${SDCARD_ROOTFS}" ]; then | ||
98 | bberror "SDCARD_ROOTFS is undefined. To use sdcard image from Freescale's BSP it needs to be defined." | ||
99 | exit 1 | ||
100 | fi | ||
101 | |||
102 | # Align boot partition and calculate total SD card image size | ||
103 | BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) | ||
104 | BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) | ||
105 | SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT}) | ||
106 | |||
107 | # Initialize a sparse file | ||
108 | if [ "x${UBOOT_CONFIG}" != "x" ] | ||
109 | then | ||
110 | SDCARD_NAME="${IMAGE_NAME}-${UBOOT_CONFIG}.rootfs.sdcard" | ||
111 | else | ||
112 | SDCARD_NAME="${IMAGE_NAME}.rootfs.sdcard" | ||
113 | fi | ||
114 | SDCARD="${DEPLOY_DIR_IMAGE}/${SDCARD_NAME}" | ||
115 | dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE}) | ||
116 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.sdcard | ||
117 | ln -s ${SDCARD_NAME} ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.sdcard | ||
118 | |||
119 | ${SDCARD_GENERATION_COMMAND} | ||
120 | } | ||
121 | |||
122 | # The sdcard requires the rootfs filesystem to be built before using | ||
123 | # it so we must make this dependency explicit. | ||
124 | IMAGE_TYPEDEP_sdcard = "${@d.getVar('SDCARD_ROOTFS', 1).split('.')[-1]}" | ||