diff options
Diffstat (limited to 'distribution/yocto-advanced/poky')
| -rw-r--r-- | distribution/yocto-advanced/poky/meta-mini/classes/fsl-dynamic-packagearch.bbclass | 47 | ||||
| -rw-r--r-- | distribution/yocto-advanced/poky/meta-mini/classes/image_sdcard.bbclass | 73 | ||||
| -rw-r--r-- | distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass | 344 | ||||
| -rw-r--r-- | distribution/yocto-advanced/poky/meta-mini/conf/distro/mini.conf | 4 | ||||
| -rw-r--r-- | distribution/yocto-advanced/poky/meta-mini/conf/machine/beaglebone-black.conf | 9 | ||||
| -rw-r--r-- | distribution/yocto-advanced/poky/meta-mini/recipes-bsp/mini-image/maxi-mini-image.bb | 3 | ||||
| -rw-r--r-- | distribution/yocto-advanced/poky/meta-mini/recipes-bsp/mini-image/tiny-image.bb | 3 | ||||
| -rw-r--r-- | distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.18.5.bb (renamed from distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.16.1.bb) | 10 |
8 files changed, 89 insertions, 404 deletions
diff --git a/distribution/yocto-advanced/poky/meta-mini/classes/fsl-dynamic-packagearch.bbclass b/distribution/yocto-advanced/poky/meta-mini/classes/fsl-dynamic-packagearch.bbclass deleted file mode 100644 index 40eae6c..0000000 --- a/distribution/yocto-advanced/poky/meta-mini/classes/fsl-dynamic-packagearch.bbclass +++ /dev/null @@ -1,47 +0,0 @@ -# Automatically set PACKAGE_ARCH for MACHINE_SOCARCH -# -# This allow to easy reuse of binary packages among similar SoCs. The -# usual use for this is to share SoC specific packages among different -# boards. -# -# MACHINE_SOCARCH_FILTER list all packages associated with -# MACHINE_SOCARCH and, when match, will set PACKAGE_ARCH as MACHINE_SOCARCH -# -# MACHINE_ARCH_FILTER list all packages associated with -# MACHINE_ARCH and, when match, will set PACKAGE_ARCH as MACHINE_ARCH -# -# For example, in meta-fsl-arm, this is used to share GPU packages for -# i.MX53 boards (as all them share the AMD GPU) and i.MX6 based boards -# (as all them share Vivante GPU). -# -# To use the class, specify, for example: -# -# MACHINE_SOCARCH_soc = "${TUNE_PKGARCH}-soc" -# -# and the need filters, as: -# -# MACHINE_ARCH_FILTER = "virtual/kernel" -# MACHINE_SOCARCH_FILTER_soc = "virtual/libgles1 ... virtual/libgl" -# -# Copyright 2013 (C) O.S. Systems Software LTDA. - -python __anonymous () { - machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split()) - machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER", True) or "").split()) - if machine_socarch_filter or machine_arch_filter: - provides = set((d.getVar("PROVIDES", True) or "").split()) - depends = set((d.getVar("DEPENDS", True) or "").split()) - PN = d.getVar("PN", True) - - package_arch = None - if list(machine_arch_filter & (provides | depends)): - package_arch = d.getVar("MACHINE_ARCH", True) - elif list(machine_socarch_filter & (provides | depends)): - package_arch = d.getVar("MACHINE_SOCARCH", True) - if not package_arch: - bb.parse.SkipPackage("You must set MACHINE_SOCARCH as MACHINE_SOCARCH_FILTER is set for this SoC.") - - if package_arch: - bb.debug(1, "Use '%s' as package archictecture for '%s'" % (package_arch, PN)) - d.setVar("PACKAGE_ARCH", package_arch) -} diff --git a/distribution/yocto-advanced/poky/meta-mini/classes/image_sdcard.bbclass b/distribution/yocto-advanced/poky/meta-mini/classes/image_sdcard.bbclass new file mode 100644 index 0000000..f70c4e5 --- /dev/null +++ b/distribution/yocto-advanced/poky/meta-mini/classes/image_sdcard.bbclass @@ -0,0 +1,73 @@ +inherit image_types + +IMAGE_BOOTLOADER ?= "u-boot" + +# Handle u-boot suffixes +UBOOT_SUFFIX ?= "bin" +UBOOT_PADDING ?= "0" +UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}" + +# Linux bootstream +IMAGE_DEPENDS_linux.sb = "virtual/kernel:do_deploy" + +# Boot partition volume id +BOOTDD_VOLUME_ID ?= "Boot ${MACHINE}" +# Boot partition size [in KiB] +BOOT_SPACE ?= "8192" +# Set alignment to 4MB [in KiB] +IMAGE_ROOTFS_ALIGNMENT = "4096" + +IMAGE_DEPENDS_sdcard = "parted-native:do_populate_sysroot \ + dosfstools-native:do_populate_sysroot \ + mtools-native:do_populate_sysroot \ + virtual/kernel:do_deploy \ + ${@d.getVar('IMAGE_BOOTLOADER', True) and d.getVar('IMAGE_BOOTLOADER', True) + ':do_deploy' or ''}" + +SDCARD = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sdcard" + +SDCARD_GENERATION_COMMAND_ti33x = "generate_ti_sdcard" + +generate_ti_sdcard () { + 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} set 1 boot on + parted ${SDCARD} print + + BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ + | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }') + mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS + + # copy files to /boot + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE} ::/MLO + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ::/u-boot.img + mmd -i ${WORKDIR}/boot.img ::/boot + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/boot/${KERNEL_IMAGETYPE} + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-am335x-boneblack.dtb ::/boot/am335x-boneblack.dtb + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/uEnv.txt ::/uEnv.txt + + # Burn Partition + dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync + dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync +} + +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 + dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE}) + + ${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/distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass b/distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass deleted file mode 100644 index deb6573..0000000 --- a/distribution/yocto-advanced/poky/meta-mini/classes/image_types_fsl.bbclass +++ /dev/null @@ -1,344 +0,0 @@ -inherit image_types - -IMAGE_BOOTLOADER ?= "u-boot" - -# Handle u-boot suffixes -UBOOT_SUFFIX ?= "bin" -UBOOT_PADDING ?= "0" -UBOOT_SUFFIX_SDCARD ?= "${UBOOT_SUFFIX}" - -# -# Handles i.MX mxs bootstream generation -# -MXSBOOT_NAND_ARGS ?= "" - -# IMX Bootlets Linux bootstream -IMAGE_DEPENDS_linux.sb = "elftosb-native:do_populate_sysroot \ - imx-bootlets:do_deploy \ - virtual/kernel:do_deploy" -IMAGE_LINK_NAME_linux.sb = "" -IMAGE_CMD_linux.sb () { - kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`" - kernel_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.dtb || true`" - linux_bd_file=imx-bootlets-linux.bd-${MACHINE} - if [ `basename $kernel_bin .bin` = `basename $kernel_dtb .dtb` ]; then - # When using device tree we build a zImage with the dtb - # appended on the end of the image - linux_bd_file=imx-bootlets-linux.bd-dtb-${MACHINE} - cat $kernel_bin $kernel_dtb \ - > $kernel_bin-dtb - rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb - ln -s $kernel_bin-dtb ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin-dtb - fi - - # Ensure the file is generated - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.linux.sb - (cd ${DEPLOY_DIR_IMAGE}; elftosb -z -c $linux_bd_file -o ${IMAGE_NAME}.linux.sb) - - # Remove the appended file as it is only used here - rm -f ${DEPLOY_DIR_IMAGE}/$kernel_bin-dtb -} - -# IMX Bootlets barebox bootstream -IMAGE_DEPENDS_barebox.mxsboot-sdcard = "elftosb-native:do_populate_sysroot \ - u-boot-mxsboot-native:do_populate_sysroot \ - imx-bootlets:do_deploy \ - barebox:do_deploy" -IMAGE_CMD_barebox.mxsboot-sdcard () { - barebox_bd_file=imx-bootlets-barebox_ivt.bd-${MACHINE} - - # Ensure the files are generated - (cd ${DEPLOY_DIR_IMAGE}; rm -f ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard; \ - elftosb -f mx28 -z -c $barebox_bd_file -o ${IMAGE_NAME}.barebox.sb; \ - mxsboot sd ${IMAGE_NAME}.barebox.sb ${IMAGE_NAME}.barebox.mxsboot-sdcard) -} - -# U-Boot mxsboot generation to SD-Card -UBOOT_SUFFIX_SDCARD_mxs ?= "mxsboot-sdcard" -IMAGE_DEPENDS_uboot.mxsboot-sdcard = "u-boot-mxsboot-native:do_populate_sysroot \ - u-boot:do_deploy" -IMAGE_CMD_uboot.mxsboot-sdcard = "mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard" - -IMAGE_DEPENDS_uboot.mxsboot-nand = "u-boot-mxsboot-native:do_populate_sysroot \ - u-boot:do_deploy" -IMAGE_CMD_uboot.mxsboot-nand = "mxsboot ${MXSBOOT_NAND_ARGS} nand \ - ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-nand" - -# Boot partition volume id -BOOTDD_VOLUME_ID ?= "Boot ${MACHINE}" - -# Boot partition size [in KiB] -BOOT_SPACE ?= "8192" - -# Barebox environment size [in KiB] -BAREBOX_ENV_SPACE ?= "512" - -# Set alignment to 4MB [in KiB] -IMAGE_ROOTFS_ALIGNMENT = "4096" - -IMAGE_DEPENDS_sdcard = "parted-native:do_populate_sysroot \ - dosfstools-native:do_populate_sysroot \ - mtools-native:do_populate_sysroot \ - virtual/kernel:do_deploy \ - ${@d.getVar('IMAGE_BOOTLOADER', True) and d.getVar('IMAGE_BOOTLOADER', True) + ':do_deploy' or ''}" - -SDCARD = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sdcard" - -SDCARD_GENERATION_COMMAND_mxs = "generate_mxs_sdcard" -SDCARD_GENERATION_COMMAND_mx25 = "generate_imx_sdcard" -SDCARD_GENERATION_COMMAND_mx5 = "generate_imx_sdcard" -SDCARD_GENERATION_COMMAND_mx6 = "generate_imx_sdcard" -SDCARD_GENERATION_COMMAND_vf60 = "generate_imx_sdcard" -SDCARD_GENERATION_COMMAND_ti33x = "generate_ti_sdcard" - -generate_ti_sdcard () { - 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} set 1 boot on - parted ${SDCARD} print - - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ - | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }') - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - - # copy files to /boot - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/MLO-${MACHINE} ::/MLO - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ::/u-boot.img - mmd -i ${WORKDIR}/boot.img ::/boot - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/boot/${KERNEL_IMAGETYPE} - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-am335x-boneblack.dtb ::/boot/am335x-boneblack.dtb - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/uEnv.txt ::/uEnv.txt - - # Burn Partition - dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync -} - -# -# Create an image that can by written onto a SD card using dd for use -# with i.MX SoC family -# -# External variables needed: -# ${SDCARD_ROOTFS} - the rootfs image to incorporate -# ${IMAGE_BOOTLOADER} - bootloader to use {u-boot, barebox} -# -# The disk layout used is: -# -# 0 -> IMAGE_ROOTFS_ALIGNMENT - reserved to bootloader (not partitioned) -# IMAGE_ROOTFS_ALIGNMENT -> BOOT_SPACE - kernel and other data -# BOOT_SPACE -> SDIMG_SIZE - rootfs -# -# Default Free space = 1.3x -# Use IMAGE_OVERHEAD_FACTOR to add more space -# <---------> -# 4MiB 8MiB SDIMG_ROOTFS 4MiB -# <-----------------------> <----------> <----------------------> <------------------------------> -# ------------------------ ------------ ------------------------ ------------------------------- -# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE | IMAGE_ROOTFS_ALIGNMENT | -# ------------------------ ------------ ------------------------ ------------------------------- -# ^ ^ ^ ^ ^ -# | | | | | -# 0 4096 4MiB + 8MiB 4MiB + 8Mib + SDIMG_ROOTFS 4MiB + 8MiB + SDIMG_ROOTFS + 4MiB -generate_imx_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 ${SDCARD} print - - # Burn bootloader - case "${IMAGE_BOOTLOADER}" in - imx-bootlets) - bberror "The imx-bootlets is not supported for i.MX based machines" - exit 1 - ;; - u-boot) - if [ -n "${SPL_BINARY}" ]; then - dd if=${DEPLOY_DIR_IMAGE}/${SPL_BINARY} of=${SDCARD} conv=notrunc seek=2 bs=512 - dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=42 bs=1K - else - dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX_SDCARD} of=${SDCARD} conv=notrunc seek=2 skip=${UBOOT_PADDING} bs=512 - fi - ;; - barebox) - dd if=${DEPLOY_DIR_IMAGE}/barebox-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 skip=1 bs=512 - dd if=${DEPLOY_DIR_IMAGE}/bareboxenv-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=1 bs=512k - ;; - "") - ;; - *) - bberror "Unkown IMAGE_BOOTLOADER value" - exit 1 - ;; - esac - - # Create boot partition image - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ - | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }') - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -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 "${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then - kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`" - kernel_bin_for_dtb="`readlink ${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 - fi - done - fi - - # Burn Partition - dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync -} - -# -# Create an image that can by written onto a SD card using dd for use -# with i.MXS SoC family -# -# External variables needed: -# ${SDCARD_ROOTFS} - the rootfs image to incorporate -# ${IMAGE_BOOTLOADER} - bootloader to use {imx-bootlets, u-boot} -# -generate_mxs_sdcard () { - # Create partition table - parted -s ${SDCARD} mklabel msdos - - case "${IMAGE_BOOTLOADER}" in - imx-bootlets) - # The disk layout used is: - # - # 0 -> 1024 - Unused (not partitioned) - # 1024 -> BOOT_SPACE - kernel and other data (bootstream) - # BOOT_SPACE -> SDIMG_SIZE - rootfs - # - # Default Free space = 1.3x - # Use IMAGE_OVERHEAD_FACTOR to add more space - # <---------> - # 1024 8MiB SDIMG_ROOTFS 4MiB - # <-------> <----------> <----------------------> <------------------------------> - # --------------------- ------------------------ ------------------------------- - # | Unused | BOOT_SPACE | ROOTFS_SIZE | IMAGE_ROOTFS_ALIGNMENT | - # --------------------- ------------------------ ------------------------------- - # ^ ^ ^ ^ ^ - # | | | | | - # 0 1024 1024 + 8MiB 1024 + 8Mib + SDIMG_ROOTFS 1024 + 8MiB + SDIMG_ROOTFS + 4MiB - parted -s ${SDCARD} unit KiB mkpart primary 1024 $(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) - - # Empty 4 bytes from boot partition - dd if=/dev/zero of=${SDCARD} conv=notrunc seek=2048 count=4 - - # Write the bootstream in (2048 + 4) bytes - dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.linux.sb of=${SDCARD} conv=notrunc seek=1 seek=2052 - ;; - u-boot) - # The disk layout used is: - # - # 1M - 2M - reserved to bootloader and other data - # 2M - BOOT_SPACE - kernel - # BOOT_SPACE - SDCARD_SIZE - rootfs - # - # The disk layout used is: - # - # 1M -> 2M - reserved to bootloader and other data - # 2M -> BOOT_SPACE - kernel and other data - # BOOT_SPACE -> SDIMG_SIZE - rootfs - # - # Default Free space = 1.3x - # Use IMAGE_OVERHEAD_FACTOR to add more space - # <---------> - # 4MiB 8MiB SDIMG_ROOTFS 4MiB - # <-----------------------> <-------------> <----------------------> <------------------------------> - # ---------------------------------------- ------------------------ ------------------------------- - # | | | |ROOTFS_SIZE | IMAGE_ROOTFS_ALIGNMENT | - # ---------------------------------------- ------------------------ ------------------------------- - # ^ ^ ^ ^ ^ ^ ^ - # | | | | | | | - # 0 1M 2M 4M 4MiB + BOOTSPACE 4MiB + BOOTSPACE + SDIMG_ROOTFS 4MiB + BOOTSPACE + SDIMG_ROOTFS + 4MiB - # - parted -s ${SDCARD} unit KiB mkpart primary 1024 2048 - parted -s ${SDCARD} unit KiB mkpart primary 2048 $(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) - - dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot.mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 skip=${UBOOT_PADDING} bs=$(expr 1024 \* 1024) - BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ - | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') - - mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE} - 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 "${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then - kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`" - kernel_bin_for_dtb="`readlink ${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 - fi - done - fi - - dd if=${WORKDIR}/boot.img of=${SDCARD} conv=notrunc seek=2 bs=$(expr 1024 \* 1024) - ;; - barebox) - # BAREBOX_ENV_SPACE is taken on BOOT_SPACE_ALIGNED but it doesn't really matter as long as the rootfs is aligned - parted -s ${SDCARD} unit KiB mkpart primary 1024 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} - ${BAREBOX_ENV_SPACE}) - parted -s ${SDCARD} unit KiB mkpart primary $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} - ${BAREBOX_ENV_SPACE}) $(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) - - dd if=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.barebox.mxsboot-sdcard of=${SDCARD} conv=notrunc seek=1 bs=$(expr 1024 \* 1024) - dd if=${DEPLOY_DIR_IMAGE}/bareboxenv-${MACHINE}.bin of=${SDCARD} conv=notrunc seek=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED} - ${BAREBOX_ENV_SPACE}) bs=1024 - ;; - *) - bberror "Unkown IMAGE_BOOTLOADER value" - exit 1 - ;; - esac - - # Change partition type for mxs processor family - bbnote "Setting partition type to 0x53 as required for mxs' SoC family." - echo -n S | dd of=${SDCARD} bs=1 count=1 seek=450 conv=notrunc - - parted ${SDCARD} print - - dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync -} - -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 - dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE}) - - ${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/distribution/yocto-advanced/poky/meta-mini/conf/distro/mini.conf b/distribution/yocto-advanced/poky/meta-mini/conf/distro/mini.conf index cc5b717..bc1a20a 100644 --- a/distribution/yocto-advanced/poky/meta-mini/conf/distro/mini.conf +++ b/distribution/yocto-advanced/poky/meta-mini/conf/distro/mini.conf @@ -115,8 +115,10 @@ PNBLACKLIST[core-image-sato] = "not buildable with mini" PNBLACKLIST[core-image-sato-dev] = "not buildable with mini" PNBLACKLIST[core-image-sato-sdk] = "not buildable with mini" PNBLACKLIST[core-image-x11] = "not buildable with mini" -PNBLACKLIST[qt4e-demo-image] = "not buildable with mini" +# PNBLACKLIST[qt4e-demo-image] = "not buildable with mini" PNBLACKLIST[core-image-weston] = "not buildable with mini" # Disable python usage in opkg-utils since it won't build with tiny config PACKAGECONFIG_pn-opkg-utils = "" + +PREFERRED_PROVIDER_virtual/kernel = "linux-vanilla" diff --git a/distribution/yocto-advanced/poky/meta-mini/conf/machine/beaglebone-black.conf b/distribution/yocto-advanced/poky/meta-mini/conf/machine/beaglebone-black.conf index 9fb2b8a..153a1bb 100644 --- a/distribution/yocto-advanced/poky/meta-mini/conf/machine/beaglebone-black.conf +++ b/distribution/yocto-advanced/poky/meta-mini/conf/machine/beaglebone-black.conf @@ -4,18 +4,19 @@ require conf/machine/include/ti33x.inc -IMAGE_FSTYPES += "sdcard ext3 tar.gz" +IMAGE_FSTYPES += "ext3 tar.gz" EXTRA_IMAGEDEPENDS += "u-boot" SERIAL_CONSOLE = "115200 ttyO0" PREFERRED_PROVIDER_virtual/kernel = "linux-vanilla" -IMAGE_CLASSES += "image_types_fsl" -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" - SPL_BINARY = "MLO" UBOOT_SUFFIX = "img" UBOOT_MACHINE = "am335x_boneblack_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" + +IMAGE_CLASSES += "image_sdcard" +SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" +IMAGE_FSTYPES += "sdcard" diff --git a/distribution/yocto-advanced/poky/meta-mini/recipes-bsp/mini-image/maxi-mini-image.bb b/distribution/yocto-advanced/poky/meta-mini/recipes-bsp/mini-image/maxi-mini-image.bb deleted file mode 100644 index bae7f2a..0000000 --- a/distribution/yocto-advanced/poky/meta-mini/recipes-bsp/mini-image/maxi-mini-image.bb +++ /dev/null @@ -1,3 +0,0 @@ -require /home/local/src/poky/meta-mini/recipes-bsp/mini-image/mini-image.bb -IMAGE_INSTALL = "eglibc hello hellocm autohello" -DESCRIPTION = "" diff --git a/distribution/yocto-advanced/poky/meta-mini/recipes-bsp/mini-image/tiny-image.bb b/distribution/yocto-advanced/poky/meta-mini/recipes-bsp/mini-image/tiny-image.bb new file mode 100644 index 0000000..ad787d5 --- /dev/null +++ b/distribution/yocto-advanced/poky/meta-mini/recipes-bsp/mini-image/tiny-image.bb @@ -0,0 +1,3 @@ +require recipes-bsp/mini-image/mini-image.bb +IMAGE_INSTALL = "eglibc hello hellocm autohello" +DESCRIPTION = "" diff --git a/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.16.1.bb b/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.18.5.bb index f155da4..3f95bfc 100644 --- a/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.16.1.bb +++ b/distribution/yocto-advanced/poky/meta-mini/recipes-kernel/linux-vanilla/linux-vanilla_3.18.5.bb @@ -16,12 +16,12 @@ KERNEL_DEVICETREE_beaglebone-black = "arch/arm/boot/dts/am335x-boneblack.dts" S = "${WORKDIR}/linux-${PV}" -SRC_URI = "https://www.kernel.org/pub/linux/kernel/v3.x/linux-${PV}.tar.xz \ - file://defconfig \ +SRC_URI = "\ +https://www.kernel.org/pub/linux/kernel/v3.x/linux-${PV}.tar.xz \ +file://defconfig \ " -SRC_URI[md5sum] = "e7a985a243b7941b6bc6240fcbc797fc" -SRC_URI[sha256sum] = "be37dda8ea090525661d64e5c7fc8580f313b7f9ba8592e32120f1332bc57d71" - +SRC_URI[md5sum] = "b655fcbc4597aa4b0cbabcfc72983259" +SRC_URI[sha256sum] = "e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90" LINUX_VERSION_EXTENSION = "-linutronix" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" |