From 187fc033b4101ae2e7a43748609f06f6ef06f193 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Wed, 16 Mar 2016 19:53:45 +0300 Subject: [PATCH] Improvements to FEL mode --- debootstrap-ng.sh | 2 +- fel-load.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh index 4fcfb74eb0..f8e2c03760 100644 --- a/debootstrap-ng.sh +++ b/debootstrap-ng.sh @@ -107,7 +107,7 @@ debootstrap_ng() # kill /etc/network/interfaces on target to prevent conflicts between kernel # and userspace network config (mainly on Xenial) rm -f $DEST/cache/sdcard/etc/network/interfaces - printf "auto lo\niface lo inet loopback" > $DEST/cache/sdcard/etc/network/interfaces + printf "auto lo\niface lo inet loopback\n\niface eth0 inet manual" > $DEST/cache/sdcard/etc/network/interfaces fi if [[ $ROOTFS_TYPE != ext4 ]]; then diff --git a/fel-load.sh b/fel-load.sh index dec316a849..bd29be35e9 100644 --- a/fel-load.sh +++ b/fel-load.sh @@ -64,18 +64,25 @@ fel_load() fi fi fi + [[ $(type -t fel_pre_load) == function ]] && fel_pre_load display_alert "Loading files via" "FEL USB" "info" - sunxi-fel -p uboot $FEL_ROOTFS/usr/lib/${CHOSEN_UBOOT}_${REVISION}_armhf/u-boot-sunxi-with-spl.bin \ + sunxi-fel $FEL_EXTRA_ARGS -p uboot $FEL_ROOTFS/usr/lib/${CHOSEN_UBOOT}_${REVISION}_armhf/u-boot-sunxi-with-spl.bin \ write 0x42000000 $FEL_ROOTFS/boot/zImage \ write 0x43000000 $FEL_ROOTFS/$dtb_file \ write 0x43100000 $FEL_ROOTFS/boot/boot.scr } +if [[ -f $SRC/userpatches/fel-hooks.sh ]]; then + display_alert "Using additional FEL hooks in" "userpatches/fel-hooks.sh" "info" + source $SRC/userpatches/fel-hooks.sh +fi + # basic sanity check if [[ -n $FEL_ROOTFS ]]; then fel_prepare_host fel_prepare_target + [[ $(type -t fel_post_prepare) == function ]] && fel_post_prepare RES=b while [[ $RES == b ]]; do if [[ $FEL_AUTO != yes ]]; then