JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility of FEL boot with overlay wrapper

Browse Source
This commit is contained in:
zador-blood-stained
2017-01-04 21:22:53 +03:00
parent 7fe050f733
commit 39eb420b52
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common.sh
View File

@@ -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

6
fel-load.sh
View File

@@ -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