aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2016-03-15 16:43:16 +0000
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2016-03-15 16:43:16 +0000
commitfc5b42e128b220582a0aaa8b48108dcb53dc22c7 (patch)
tree8eb64207d43a880fbf06db8008784dacbcd2a1a4
parentb6d82b37dd4330d79450f0ae2936a0eb1dac34c4 (diff)
downloadmeta-qcom-fc5b42e128b220582a0aaa8b48108dcb53dc22c7.tar.gz
meta-qcom-fc5b42e128b220582a0aaa8b48108dcb53dc22c7.tar.bz2
meta-qcom-fc5b42e128b220582a0aaa8b48108dcb53dc22c7.zip
linux-qcom-bootimg: improve variable names
BOOT_IMG_NAME and DT_IMG_NAME were designed to mimic KERNEL_IMAGE_BASE_NAME, but for some reasons their initial name was different.. let's align the name to match the original variable. Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-rw-r--r--recipes-kernel/linux/linux-qcom-bootimg.inc22
1 files changed, 11 insertions, 11 deletions
diff --git a/recipes-kernel/linux/linux-qcom-bootimg.inc b/recipes-kernel/linux/linux-qcom-bootimg.inc
index 28f0091..78c6bd7 100644
--- a/recipes-kernel/linux/linux-qcom-bootimg.inc
+++ b/recipes-kernel/linux/linux-qcom-bootimg.inc
@@ -7,15 +7,15 @@ python __anonymous () {
QCOM_BOOTIMG_ROOTFS ?= "undefined"
# set output file names
-DT_IMG_NAME = "dt-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-DT_IMG_NAME[vardepsexclude] = "DATETIME"
+DT_IMAGE_BASE_NAME = "dt-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
+DT_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
-BOOT_IMG_NAME = "boot-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-BOOT_IMG_NAME[vardepsexclude] = "DATETIME"
+BOOT_IMAGE_BASE_NAME = "boot-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
+BOOT_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
do_deploy_append_dragonboard-410c() {
- dtbTool -o ${DEPLOYDIR}/${DT_IMG_NAME}.img -s 2048 ${B}/arch/${ARCH}/boot/dts/qcom/
+ dtbTool -o ${DEPLOYDIR}/${DT_IMAGE_BASE_NAME}.img -s 2048 ${B}/arch/${ARCH}/boot/dts/qcom/
tmp="${SERIAL_CONSOLES}"
baudrate=`echo $tmp | sed 's/\;.*//'`
@@ -27,16 +27,16 @@ do_deploy_append_dragonboard-410c() {
mkbootimg --kernel ${B}/arch/${ARCH}/boot/Image \
--ramdisk ${B}/initrd.img \
- --output ${DEPLOYDIR}/${BOOT_IMG_NAME}.img \
- --dt ${DEPLOYDIR}/${DT_IMG_NAME}.img \
+ --output ${DEPLOYDIR}/${BOOT_IMAGE_BASE_NAME}.img \
+ --dt ${DEPLOYDIR}/${DT_IMAGE_BASE_NAME}.img \
--pagesize 2048 \
--base 0x80000000 \
--cmdline \
"root=/dev/${QCOM_BOOTIMG_ROOTFS} rw rootwait console=${ttydev},${baudrate}n8"
cd ${DEPLOYDIR}
- ln -sf ${DT_IMG_NAME}.img dt-${MACHINE}.img
- ln -sf ${BOOT_IMG_NAME}.img boot-${MACHINE}.img
+ ln -sf ${DT_IMAGE_BASE_NAME}.img dt-${MACHINE}.img
+ ln -sf ${BOOT_IMAGE_BASE_NAME}.img boot-${MACHINE}.img
cd -
}
@@ -52,13 +52,13 @@ do_deploy_append_ifc6410 () {
mkbootimg --kernel ${B}/arch/${ARCH}/boot/zImage \
--ramdisk ${B}/initrd.img \
- --output ${DEPLOYDIR}/${BOOT_IMG_NAME}.img \
+ --output ${DEPLOYDIR}/${BOOT_IMAGE_BASE_NAME}.img \
--pagesize 2048 \
--base 0x80200000 \
--cmdline \
"root=/dev/${QCOM_BOOTIMG_ROOTFS} rw rootwait console=${ttydev},${baudrate}n8"
cd ${DEPLOYDIR}
- ln -sf ${BOOT_IMG_NAME}.img boot-${MACHINE}.img
+ ln -sf ${BOOT_IMAGE_BASE_NAME}.img boot-${MACHINE}.img
cd -
}