diff --git a/common.sh b/common.sh index bb62c42693..4001619c7d 100644 --- a/common.sh +++ b/common.sh @@ -156,6 +156,10 @@ compile_uboot() Description: Uboot loader $version END + # copy config file to the package + # useful for FEL boot with overlayfs_wrapper + [[ -f .config && -n $BOOTCONFIG ]] && cp .config $uboot_name/usr/lib/u-boot/$BOOTCONFIG + display_alert "Building deb" "${uboot_name}.deb" "info" eval 'dpkg -b $uboot_name 2>&1' ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/compilation.log'} rm -rf $uboot_name diff --git a/fel-load.sh b/fel-load.sh index 4f066b5e45..5a3c946788 100644 --- a/fel-load.sh +++ b/fel-load.sh @@ -58,11 +58,7 @@ fel_load() local dtb_file=boot/script.bin fi else - if [[ -f $SOURCES/$BOOTSOURCEDIR/.config ]]; then - local dtb_file=boot/dtb/$(grep CONFIG_DEFAULT_DEVICE_TREE $SOURCES/$BOOTSOURCEDIR/.config | cut -d '"' -f2).dtb - else - local dtb_file=boot/dtb/$(grep CONFIG_DEFAULT_DEVICE_TREE $SOURCES/$BOOTSOURCEDIR/configs/$BOOTCONFIG | cut -d '"' -f2).dtb - fi + local dtb_file=boot/dtb/$(grep CONFIG_DEFAULT_DEVICE_TREE $FEL_ROOTFS/usr/lib/u-boot/$BOOTCONFIG | cut -d '"' -f2).dtb fi fi [[ $(type -t fel_pre_load) == function ]] && fel_pre_load