sdcard_image-rpi.bbclass: Include in the SD card image the armstub file

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
This commit is contained in:
Andrei Gherzan 2019-07-02 15:18:17 +01:00
parent d6999eb06f
commit 24a77246ac

View File

@ -55,6 +55,7 @@ do_image_rpi_sdimg[depends] = " \
dosfstools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \
virtual/kernel:do_deploy \ virtual/kernel:do_deploy \
${IMAGE_BOOTLOADER}:do_deploy \ ${IMAGE_BOOTLOADER}:do_deploy \
${@bb.utils.contains('ARMSTUBS', '', '', 'armstubs:do_deploy',d)} \
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'rpi-u-boot-scr:do_deploy', '',d)} \ ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'rpi-u-boot-scr:do_deploy', '',d)} \
" "
@ -113,6 +114,9 @@ IMAGE_CMD_rpi-sdimg () {
rm -f ${WORKDIR}/boot.img rm -f ${WORKDIR}/boot.img
mkfs.vfat -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS mkfs.vfat -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
if [ -n "${ARMSTUB}" ]; then
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/
fi
if test -n "${DTS}"; then if test -n "${DTS}"; then
# Copy board device trees to root folder # Copy board device trees to root folder
for dtbf in ${@split_overlays(d, True)}; do for dtbf in ${@split_overlays(d, True)}; do