aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2015-02-08 00:30:40 +0200
committerAndrei Gherzan <andrei@gherzan.ro>2015-02-08 00:30:40 +0200
commitdedd45f4f819b0b7b2d13ce7ce71e3fa92832bd4 (patch)
treeff055775a03d7ea40f9c14432e7a71007f84d839
parent8c8a5cd64ccd49b0bbac46f0a8356fe9f07940ab (diff)
downloadmeta-raspberrypi-dedd45f4f819b0b7b2d13ce7ce71e3fa92832bd4.tar.gz
meta-raspberrypi-dedd45f4f819b0b7b2d13ce7ce71e3fa92832bd4.tar.bz2
meta-raspberrypi-dedd45f4f819b0b7b2d13ce7ce71e3fa92832bd4.zip
Use variable for kernel image deployed name on SD card
Change-Id: I4a55b53d337930aae3351629a902dbac832ac958 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-rw-r--r--classes/sdcard_image-rpi.bbclass7
-rw-r--r--conf/machine/include/rpi-base.inc2
2 files changed, 6 insertions, 3 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 43f1346..86cf773 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -31,6 +31,9 @@ IMAGE_BOOTLOADER ?= "bcm2835-bootfiles"
# Set initramfs extension
KERNEL_INITRAMFS ?= ""
+# Kernel image name
+SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img"
+
# Boot partition volume id
BOOTDD_VOLUME_ID ?= "${MACHINE}"
@@ -104,7 +107,7 @@ IMAGE_CMD_rpi-sdimg () {
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
case "${KERNEL_IMAGETYPE}" in
"uImage")
- mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::kernel.img
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::${SDIMG_KERNELIMAGE}
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
;;
*)
@@ -124,7 +127,7 @@ IMAGE_CMD_rpi-sdimg () {
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb
done
fi
- mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::kernel.img
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}
;;
esac
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index 65ec712..f1c404d 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -46,4 +46,4 @@ MACHINE_EXTRA_RRECOMMENDS += " kernel-modules"
# Set Raspberrypi splash image
SPLASH = "psplash-raspberrypi"
-IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* ${KERNEL_IMAGETYPE};kernel.img"
+IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* ${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}"