diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-02 15:18:17 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-20 21:56:21 +0100 |
commit | d15e62704999ebd4209128327efb31ec7257b0eb (patch) | |
tree | 2561680e6a8af17e4aca2433f18aece17cd9223e | |
parent | 33f810f43486c509293e04edf56701b16339582a (diff) | |
download | meta-raspberrypi-d15e62704999ebd4209128327efb31ec7257b0eb.tar.gz |
sdcard_image-rpi.bbclass: Include in the SD card image the armstub file
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-rw-r--r-- | classes/sdcard_image-rpi.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 6cbee8b..3a4d665 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -55,6 +55,7 @@ do_image_rpi_sdimg[depends] = " \ | |||
55 | dosfstools-native:do_populate_sysroot \ | 55 | dosfstools-native:do_populate_sysroot \ |
56 | virtual/kernel:do_deploy \ | 56 | virtual/kernel:do_deploy \ |
57 | ${IMAGE_BOOTLOADER}:do_deploy \ | 57 | ${IMAGE_BOOTLOADER}:do_deploy \ |
58 | ${@bb.utils.contains('ARMSTUBS', '', '', 'armstubs:do_deploy',d)} \ | ||
58 | ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ | 59 | ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ |
59 | ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'rpi-u-boot-scr:do_deploy', '',d)} \ | 60 | ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'rpi-u-boot-scr:do_deploy', '',d)} \ |
60 | " | 61 | " |
@@ -113,6 +114,9 @@ IMAGE_CMD_rpi-sdimg () { | |||
113 | rm -f ${WORKDIR}/boot.img | 114 | rm -f ${WORKDIR}/boot.img |
114 | mkfs.vfat -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS | 115 | mkfs.vfat -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS |
115 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ | 116 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ |
117 | if [ -n "${ARMSTUB}" ]; then | ||
118 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/ | ||
119 | fi | ||
116 | if test -n "${DTS}"; then | 120 | if test -n "${DTS}"; then |
117 | # Copy board device trees to root folder | 121 | # Copy board device trees to root folder |
118 | for dtbf in ${@split_overlays(d, True)}; do | 122 | for dtbf in ${@split_overlays(d, True)}; do |