Merge branch 'master' of https://github.com/zador-blood-stained/lib
This commit is contained in:
commit
adf1eac5a5
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user