diff options
| author | Michael Pratt <mcpratt@pm.me> | 2021-02-24 22:55:09 -0500 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2021-06-11 07:20:31 +0200 |
| commit | 64d845ef027b31f3dc8f1a6a692c960a3a8844f3 (patch) | |
| tree | 3adfe1bc7a6b6bc0b911a228ad4a4f19cb9db769 /target/linux/ath79/dts/ar934x_senao_loader.dtsi | |
| parent | 1f6ec4b29ebfda19d9df01f1cc289ed6454683cf (diff) | |
| download | upstream-64d845ef027b31f3dc8f1a6a692c960a3a8844f3.tar.gz upstream-64d845ef027b31f3dc8f1a6a692c960a3a8844f3.tar.bz2 upstream-64d845ef027b31f3dc8f1a6a692c960a3a8844f3.zip | |
ath79: remove 'fakeroot' for Senao devices
By using the same custom kernel header magic
in both OKLI lzma-loader, DTS, and makefile
this hack is not necessary anymore
However, "rootfs" size and checksum
must now be supplied by the factory.bin image
through a script that is accepted by the OEM upgrade script.
This is because Senao OEM scripts assume a squashfs header exists
at the offset for the original "rootfs" partition
which is actually the kernel + rootfs in this implementation,
and takes size value from the header that would be there with hexdump,
but this offset is now the uImage header instead.
This frees up 1 eraseblock
previously used by the "fakeroot" partition
for bypassing the OEM image verification.
Also, these Senao devices with a 'failsafe' partition
and the tar-gz factory.bin platform would otherwise require
flashing the new tar-gz sysupgrade.bin afterward.
So this also prevents having to flash both images
when starting from OEM or 'failsafe'
the OEM upgrade script verifies the header magic numbers,
but only the first two bytes.
Example:
[ "${magic_word_kernel}" = "2705" ] &&
[ "${magic_word_rootfs}" = "7371" -o "${magic_word_rootfs}" = "6873" ] &&
errcode="0"
therefore picked the magic number
0x73714f4b
which is
'sqOK'
Signed-off-by: Michael Pratt <mcpratt@pm.me>
(cherry picked from commit 4a0cc5d4ef29a11914850c72158aca1e2a170fb0)
Diffstat (limited to 'target/linux/ath79/dts/ar934x_senao_loader.dtsi')
| -rw-r--r-- | target/linux/ath79/dts/ar934x_senao_loader.dtsi | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/target/linux/ath79/dts/ar934x_senao_loader.dtsi b/target/linux/ath79/dts/ar934x_senao_loader.dtsi index aa8a36d242..35e5f13535 100644 --- a/target/linux/ath79/dts/ar934x_senao_loader.dtsi +++ b/target/linux/ath79/dts/ar934x_senao_loader.dtsi @@ -15,7 +15,7 @@ partition@0 { compatible = "openwrt,uimage", "denx,uimage"; - openwrt,ih-magic = <IH_MAGIC_OKLI>; + openwrt,ih-magic = <0x73714f4b>; label = "firmware"; reg = <0x0 0x0>; }; @@ -68,15 +68,9 @@ reg = <0x0b0000 0x170000>; }; - partition@220000 { - label = "fakeroot"; - reg = <0x220000 0x010000>; - read-only; - }; - - fwconcat0: partition@230000 { + fwconcat0: partition@220000 { label = "fwconcat0"; - reg = <0x230000 0xbc0000>; + reg = <0x220000 0xbd0000>; }; partition@df0000 { |