OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

detect flash type by ipcinfo (#547)

pull/548/head
cronyx 2022-11-12 11:49:45 +03:00 committed by GitHub
parent 2e76dc2ca9
commit eab344b4b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
general/overlay/usr/sbin/sysupgrade
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
# #
# OpenIPC.org | v.20220831 # OpenIPC.org | v.20221111
# #
scr_version=1.0.12 scr_version=1.0.13
args=" $@" args=" $@"
@ -77,7 +77,10 @@ do_wipe_overlay() {
download_firmware() { download_firmware() {
echo_c 33 "\nFirmware" echo_c 33 "\nFirmware"
osr=$(get_system_build) osr=$(get_system_build)
ftype=$(ipcinfo -F)
if $(echo ${ftype} | (! grep -qE 'nor|nand')); then
ftype=$(get_flash_type) ftype=$(get_flash_type)
fi
build="${soc}-${ftype}-${osr}" build="${soc}-${ftype}-${osr}"
[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz" [ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz"
echo "Download from $url" echo "Download from $url"
@ -197,6 +200,7 @@ get_system_build() {
grep "BUILD_OPTION" "/etc/os-release" | head -1 | cut -d= -f2 grep "BUILD_OPTION" "/etc/os-release" | head -1 | cut -d= -f2
} }
# This flash type detection is deprecated and will be removed in the next updates...
get_flash_type() { get_flash_type() {
has_nand=$(fw_printenv bootcmd | grep nand | wc -l) has_nand=$(fw_printenv bootcmd | grep nand | wc -l)
[ "1" = "$has_nand" ] && echo "nand" || echo "nor" [ "1" = "$has_nand" ] && echo "nand" || echo "nor"