Permalink
Browse files

Compatibility of FEL boot with overlay wrapper

  • Loading branch information...
1 parent 7fe050f commit 39eb420b5228e134c7770e8a5ae016efc70aa7c5 @zador-blood-stained zador-blood-stained committed Jan 4, 2017
Showing with 5 additions and 5 deletions.
  1. +4 −0 common.sh
  2. +1 −5 fel-load.sh
View
@@ -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
View
@@ -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

0 comments on commit 39eb420

Please sign in to comment.