diff options
Diffstat (limited to 'meta/classes/kernel-fitimage.bbclass')
-rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index f5082c93df..b9d8270027 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
@@ -535,13 +535,19 @@ fitimage_assemble() { | |||
535 | # Step 2: Prepare a DTB image section | 535 | # Step 2: Prepare a DTB image section |
536 | # | 536 | # |
537 | 537 | ||
538 | if [ -z "${EXTERNAL_KERNEL_DEVICETREE}" ] && [ -n "${KERNEL_DEVICETREE}" ]; then | 538 | if [ -n "${KERNEL_DEVICETREE}" ]; then |
539 | dtbcount=1 | 539 | dtbcount=1 |
540 | for DTB in ${KERNEL_DEVICETREE}; do | 540 | for DTB in ${KERNEL_DEVICETREE}; do |
541 | if echo ${DTB} | grep -q '/dts/'; then | 541 | if echo ${DTB} | grep -q '/dts/'; then |
542 | bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." | 542 | bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." |
543 | DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` | 543 | DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` |
544 | fi | 544 | fi |
545 | |||
546 | # Skip ${DTB} if it's also provided in ${EXTERNAL_KERNEL_DEVICETREE} | ||
547 | if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ] && [ -s ${EXTERNAL_KERNEL_DEVICETREE}/${DTB} ]; then | ||
548 | continue | ||
549 | fi | ||
550 | |||
545 | DTB_PATH="arch/${ARCH}/boot/dts/${DTB}" | 551 | DTB_PATH="arch/${ARCH}/boot/dts/${DTB}" |
546 | if [ ! -e "${DTB_PATH}" ]; then | 552 | if [ ! -e "${DTB_PATH}" ]; then |
547 | DTB_PATH="arch/${ARCH}/boot/${DTB}" | 553 | DTB_PATH="arch/${ARCH}/boot/${DTB}" |
@@ -769,4 +775,4 @@ python () { | |||
769 | bb.build.deltask('do_assemble_fitimage', d) | 775 | bb.build.deltask('do_assemble_fitimage', d) |
770 | bb.build.deltask('generate_rsa_keys', d) | 776 | bb.build.deltask('generate_rsa_keys', d) |
771 | bb.build.addtask('generate_rsa_keys', 'do_assemble_fitimage_initramfs', 'do_bundle_initramfs', d) | 777 | bb.build.addtask('generate_rsa_keys', 'do_assemble_fitimage_initramfs', 'do_bundle_initramfs', d) |
772 | } \ No newline at end of file | 778 | } |