summaryrefslogtreecommitdiff
path: root/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta-raspberrypi/classes/sdcard_image-rpi.bbclass')
-rw-r--r--meta-raspberrypi/classes/sdcard_image-rpi.bbclass6
1 files changed, 1 insertions, 5 deletions
diff --git a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
index 8197978a3..0ae98cdab 100644
--- a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
+++ b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
@@ -25,9 +25,6 @@ inherit image_types
# This image depends on the rootfs image
IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"
-# Set kernel and boot loader
-IMAGE_BOOTLOADER ?= "bootfiles"
-
# Kernel image name
SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img"
SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
@@ -56,8 +53,7 @@ do_image_rpi_sdimg[depends] = " \
mtools-native:do_populate_sysroot \
dosfstools-native:do_populate_sysroot \
virtual/kernel:do_deploy \
- ${IMAGE_BOOTLOADER}:do_deploy \
- rpi-config:do_deploy \
+ rpi-bootfiles:do_deploy \
${@bb.utils.contains('MACHINE_FEATURES', 'armstub', '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-default-script:do_deploy', '',d)} \