-
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #193 from grische/proper_7360v2_migration
xrx200: ensure the correct version for fritz7360
- Loading branch information
Showing
1 changed file
with
107 additions
and
0 deletions.
There are no files selected for viewing
107 changes: 107 additions & 0 deletions
107
patches/0001-xrx200-ensure-the-correct-version-for-fritz7360.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| From 449bbb4e66bdf09706aac68a103200848249787a Mon Sep 17 00:00:00 2001 | ||
| From: Grische <[email protected]> | ||
| Date: Sun, 18 Sep 2022 14:05:21 +0200 | ||
| Subject: [PATCH] xrx200: ensure the correct version for fritz7360 | ||
|
|
||
| --- | ||
| ...re-the-correct-version-for-fritz7360.patch | 88 +++++++++++++++++++ | ||
| 1 file changed, 88 insertions(+) | ||
| create mode 100644 patches/openwrt/0007-xrx200-ensure-the-correct-version-for-fritz7360.patch | ||
|
|
||
| diff --git a/patches/openwrt/0007-xrx200-ensure-the-correct-version-for-fritz7360.patch b/patches/openwrt/0007-xrx200-ensure-the-correct-version-for-fritz7360.patch | ||
| new file mode 100644 | ||
| index 00000000..260ffaac | ||
| --- /dev/null | ||
| +++ b/patches/openwrt/0007-xrx200-ensure-the-correct-version-for-fritz7360.patch | ||
| @@ -0,0 +1,88 @@ | ||
| +From c9ea8ac5566d8d11c16f36577323c830d18e4300 Mon Sep 17 00:00:00 2001 | ||
| +From: Grische <[email protected]> | ||
| +Date: Sun, 18 Sep 2022 14:03:16 +0200 | ||
| +Subject: [PATCH] xrx200: ensure the correct version for fritz7360 | ||
| + | ||
| +https://github.com/freifunk-gluon/gluon/pull/2648 | ||
| +--- | ||
| + .../base-files/lib/preinit/01_sysinfo.sh | 68 +++++++++++++++++++ | ||
| + 1 file changed, 68 insertions(+) | ||
| + create mode 100644 target/linux/lantiq/xrx200/base-files/lib/preinit/01_sysinfo.sh | ||
| + | ||
| +diff --git a/target/linux/lantiq/xrx200/base-files/lib/preinit/01_sysinfo.sh b/target/linux/lantiq/xrx200/base-files/lib/preinit/01_sysinfo.sh | ||
| +new file mode 100644 | ||
| +index 0000000000..d91b3dd614 | ||
| +--- /dev/null | ||
| ++++ b/target/linux/lantiq/xrx200/base-files/lib/preinit/01_sysinfo.sh | ||
| +@@ -0,0 +1,68 @@ | ||
| ++set_sysinfo_xrx200_for_fritz7360_model() { | ||
| ++ local board_name=$1 | ||
| ++ local model | ||
| ++ local urlader_version urlader_memsize urlader_flashsize | ||
| ++ local hexdump_format='4/1 "%02x""\n"' | ||
| ++ | ||
| ++ # Values are based on urlader-parser-py | ||
| ++ # https://github.com/grische/urlader-parser-py/blob/42970bf8dec7962317df4ff734c57ebf36df8905/parser.py#L77-L84 | ||
| ++ urlader_version="$(dd if=/dev/mtd0ro bs=1 skip=$((0x580+0x0)) count=4 | hexdump -e "${hexdump_format}")" | ||
| ++ if [ "${urlader_version}" != "00000003" ]; then | ||
| ++ logger -s -p warn -t sysinfo-xrx200 "unexpected urlader version found: ${urlader_version}" | ||
| ++ return | ||
| ++ fi | ||
| ++ | ||
| ++ urlader_memsize="$(dd if=/dev/mtd0ro bs=1 skip=$((0x580+0x4)) count=4 | hexdump -e "${hexdump_format}")" | ||
| ++ if [ "${urlader_memsize}" != "08000000" ]; then | ||
| ++ logger -s -p warn -t sysinfo-xrx200 "unexpected memsize found: ${urlader_memsize}" | ||
| ++ return | ||
| ++ fi | ||
| ++ | ||
| ++ urlader_flashsize="$(dd if=/dev/mtd0ro bs=1 skip=$((0x580+0x8)) count=4 | hexdump -e "${hexdump_format}")" | ||
| ++ case "${urlader_flashsize}" in | ||
| ++ "02000000") # 32MB | ||
| ++ # see vr9_avm_fritz7360-v2.dts | ||
| ++ board_name="avm,fritz7360-v2" | ||
| ++ model="AVM FRITZ!Box 7360 V2" | ||
| ++ ;; | ||
| ++ "01000000") # 16MB | ||
| ++ # see vr9_avm_fritz7360sl.dts | ||
| ++ board_name="avm,fritz7360sl" | ||
| ++ model="AVM FRITZ!Box 7360 SL" | ||
| ++ ;; | ||
| ++ *) | ||
| ++ logger -s -p warn -t sysinfo-xrx200 "unexpected flashsize found: ${urlader_flashsize}" | ||
| ++ return | ||
| ++ ;; | ||
| ++ esac | ||
| ++ | ||
| ++ logger -s -p notice -t sysinfo-xrx200 "detected ${board_name} from urlader partition /dev/mtd0ro. Enforcing model ${model}." | ||
| ++ echo "${board_name}" > /tmp/sysinfo/board_name | ||
| ++ echo "${model}" > /tmp/sysinfo/model | ||
| ++} | ||
| ++ | ||
| ++do_sysinfo_xrx200() { | ||
| ++ local reported_board board_name model | ||
| ++ | ||
| ++ [ -d /proc/device-tree ] || return | ||
| ++ reported_board="$(strings /proc/device-tree/compatible | head -1)" | ||
| ++ | ||
| ++ mkdir -p /tmp/sysinfo | ||
| ++ # 7360 is notoriously known for not writing "v2" on their labels and many | ||
| ++ # routers have flashed the wrong firmware with the wrong flash layout. | ||
| ++ # We ensure that the underlying hardware is reported correctly, so that | ||
| ++ # future upgrades will use the correct flash layout. | ||
| ++ # Using 7360v2 hardware, an upgrade from a 7360v1/sl firmware to a 7360v2 | ||
| ++ # is working. | ||
| ++ case "${reported_board}" in | ||
| ++ *7360*) | ||
| ++ set_sysinfo_xrx200_for_fritz7360_model "${reported_board}" | ||
| ++ ;; | ||
| ++ *) | ||
| ++ # fall back to OpenWRT's sysinfo detection | ||
| ++ return | ||
| ++ ;; | ||
| ++ esac | ||
| ++} | ||
| ++ | ||
| ++boot_hook_add preinit_main do_sysinfo_xrx200 | ||
| +-- | ||
| +2.25.1 | ||
| + | ||
| -- | ||
| 2.25.1 | ||
|
|