Qubot/armbian-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't delete /boot/armbianEnv.txt file at least for meson64 (#2252)

Browse Source 
* Don't delete /boot/armbianEnv.txt file at least for meson64
fix for #2249 ODroid-N2 armbian-config-->hardware menu not work

* Update meson.txt

* Update boot-odroid-n2.ini

Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
This commit is contained in:
iav 2020-10-13 21:34:45 +03:00 committed by GitHub
parent 98fc5586df
commit 599dd2a8cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/bootenv/meson.txt
View File

@ -1,3 +1,2 @@
verbosity=1
console=both
ethaddr=00:50:43:84:fb:2f

5
config/bootscripts/boot-odroid-n2.ini
View File

@ -1,10 +1,5 @@
ODROIDN2-UBOOT-CONFIG
setenv rootdev "/dev/mmcblk0p1"
setenv rootfstype "ext4"
ODROIDN2-UBOOT-CONFIG
# Display splash logo
setenv bootlogo "false"

4
lib/debootstrap.sh
View File

@ -518,7 +518,9 @@ prepare_partitions()
else
sed -i 's/^setenv rootdev .*/setenv rootdev "'$rootfs'"/' $SDCARD/boot/boot.ini
fi
[[ -f $SDCARD/boot/armbianEnv.txt ]] && rm $SDCARD/boot/armbianEnv.txt
if [[ $LINUXFAMILY != meson64 ]]; then
[[ -f $SDCARD/boot/armbianEnv.txt ]] && rm $SDCARD/boot/armbianEnv.txt
fi
fi
# if we have a headless device, set console to DEFAULT_CONSOLE