diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2017-03-22 23:53:53 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2019-04-08 13:49:57 +0200 |
| commit | bc502ad09a08308aae18eb51caf82eea738928bc (patch) | |
| tree | e223927d633f73a0d09fb5d81400c448b89e0a7a | |
| parent | 62aca76345130fedc10eecc8c8d812007cadea6a (diff) | |
| download | openembedded-core-contrib-bc502ad09a08308aae18eb51caf82eea738928bc.tar.gz | |
linux-dtb.inc: search dtb in all subdirectories of arch/*/boot
Some architectures, like arm64, organize dts files in vendor
subdirectories.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
| -rw-r--r-- | meta/recipes-kernel/linux/linux-dtb.inc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc index 0174c80d85..22e374fa88 100644 --- a/meta/recipes-kernel/linux/linux-dtb.inc +++ b/meta/recipes-kernel/linux/linux-dtb.inc @@ -16,15 +16,6 @@ normalize_dtb () { echo "${DTB}" } -get_real_dtb_path_in_kernel () { - DTB="$1" - DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}" - if [ ! -e "${DTB_PATH}" ]; then - DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}" - fi - echo "${DTB_PATH}" -} - do_compile_append() { for DTB in ${KERNEL_DEVICETREE}; do DTB=`normalize_dtb "${DTB}"` @@ -40,7 +31,7 @@ do_install_append() { for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` + DTB_PATH=`find ${B}/arch/${ARCH}/boot -name "${DTB}"` install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} done done @@ -56,7 +47,7 @@ do_deploy_append() { symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` + DTB_PATH=`find ${B}/arch/${ARCH}/boot -name "${DTB}"` install -d ${DEPLOYDIR} install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT} ln -sf ${DTB_NAME}.${DTB_EXT} ${DEPLOYDIR}/${DTB_SYMLINK_NAME}.${DTB_EXT} |