From: Chunrong Guo <chunrong....@nxp.com>
* For example:
KERNEL_DEVICETREE ?= "freescale/fsl-ls1046a-rdb.dtb"
${DTB}= "freescale/fsl-ls1046a-rdb.dtb"
but only the dtb name should be used.
* Support "ext2.gz " filesystems
* Support mutiple KERNEL_IMAGETYPE
For example:
KERNEL_IMAGETYPE = "Image" or KERNEL_IMAGETYPE = "zImage"
Signed-off-by: Chunrong Guo <chunrong....@nxp.com>
---
meta/classes/kernel-fitimage.bbclass | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 2630b47..63f03a5 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -10,7 +10,7 @@ python __anonymous () {
if d.getVar("UBOOT_ARCH") == "x86":
replacementtype = "bzImage"
else:
- replacementtype = "zImage"
+ replacementtype = d.getVar("KERNEL_IMAGETYPE")
# Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
# to kernel.bbclass . We have to override it, since we pack zImage
@@ -342,15 +342,8 @@ fitimage_assemble() {
if [ -n "${KERNEL_DEVICETREE}" ]; then
dtbcount=1
for DTB in ${KERNEL_DEVICETREE}; do
- if echo ${DTB} | grep -q '/dts/'; then
- bbwarn "${DTB} contains the full path to the
the dts file, but only the dtb name should be used."
- DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
- fi
- DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
- if [ ! -e "${DTB_PATH}" ]; then
- DTB_PATH="arch/${ARCH}/boot/${DTB}"
- fi
-
+ DTB=`basename ${DTB}`
+ DTB_PATH=`find arch/${ARCH}/boot -name "${DTB}"`
DTBS="${DTBS} ${DTB}"
fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
done
@@ -369,7 +362,7 @@ fitimage_assemble() {
#
if [ "x${ramdiskcount}" = "x1" ] ; then
# Find and use the first initramfs image archive type we find
- for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz cpio; do
+ for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz cpio
ext2.gz; do
initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.${img}"
echo "Using $initramfs_path"
if [ -e "${initramfs_path}" ]; then
--
1.9.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
