summaryrefslogtreecommitdiffstats
path: root/classes
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 /classes
parent8c8a5cd64ccd49b0bbac46f0a8356fe9f07940ab (diff)
downloadmeta-raspberrypi-dedd45f4f819b0b7b2d13ce7ce71e3fa92832bd4.tar.gz
Use variable for kernel image deployed name on SD card
Change-Id: I4a55b53d337930aae3351629a902dbac832ac958 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Diffstat (limited to 'classes')
-rw-r--r--classes/sdcard_image-rpi.bbclass7
1 files changed, 5 insertions, 2 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"
31# Set initramfs extension 31# Set initramfs extension
32KERNEL_INITRAMFS ?= "" 32KERNEL_INITRAMFS ?= ""
33 33
34# Kernel image name
35SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img"
36
34# Boot partition volume id 37# Boot partition volume id
35BOOTDD_VOLUME_ID ?= "${MACHINE}" 38BOOTDD_VOLUME_ID ?= "${MACHINE}"
36 39
@@ -104,7 +107,7 @@ IMAGE_CMD_rpi-sdimg () {
104 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ 107 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
105 case "${KERNEL_IMAGETYPE}" in 108 case "${KERNEL_IMAGETYPE}" in
106 "uImage") 109 "uImage")
107 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::kernel.img 110 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::${SDIMG_KERNELIMAGE}
108 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage 111 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
109 ;; 112 ;;
110 *) 113 *)
@@ -124,7 +127,7 @@ IMAGE_CMD_rpi-sdimg () {
124 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb 127 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb
125 done 128 done
126 fi 129 fi
127 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::kernel.img 130 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}
128 ;; 131 ;;
129 esac 132 esac
130 133