[OpenWrt-Devel] ramips: specify "firmware" partition format for remaining devices

Message ID 20181213161637.12809-1-zajec5@gmail.com
State Under Review
Delegated to: Rafał Miłecki
Headers show
Series
  • [OpenWrt-Devel] ramips: specify "firmware" partition format for remaining devices
Related show

Commit Message

Rafał Miłecki Dec. 13, 2018, 4:16 p.m.
From: Rafał Miłecki <rafal@milecki.pl>

It results in calling the right MTD parser directly instead of trying
them one by one.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
I'm not sure about the AR670W.dts. It seems to be using WRG according to
the image generating code:
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn16a_airlink_ar670w

On the other hand INAGAKI state it uses LZMA in the commit d70ec3008d4c
("ramips: specify "firmware" partition format").

INAGAKI: can you take a look at this, please?
---
 target/linux/ramips/dts/AR670W.dts      | 1 +
 target/linux/ramips/dts/DAP-1522-A1.dts | 1 +
 target/linux/ramips/dts/WCR-1166DS.dts  | 1 +
 3 files changed, 3 insertions(+)

Comments

INAGAKI Hiroshi Dec. 14, 2018, 3:19 a.m. | #1
On 2018/12/14 1:16, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> It results in calling the right MTD parser directly instead of trying
> them one by one.
> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
> I'm not sure about the AR670W.dts. It seems to be using WRG according to
> the image generating code:
> IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn16a_airlink_ar670w
> 
> On the other hand INAGAKI state it uses LZMA in the commit d70ec3008d4c
> ("ramips: specify "firmware" partition format").
> 
> INAGAKI: can you take a look at this, please?
> ---
>   target/linux/ramips/dts/AR670W.dts      | 1 +
>   target/linux/ramips/dts/DAP-1522-A1.dts | 1 +
>   target/linux/ramips/dts/WCR-1166DS.dts  | 1 +
>   3 files changed, 3 insertions(+)
> 
> diff --git a/target/linux/ramips/dts/AR670W.dts b/target/linux/ramips/dts/AR670W.dts
> index 3ee39c1eb7..5f8a9a9593 100644
> --- a/target/linux/ramips/dts/AR670W.dts
> +++ b/target/linux/ramips/dts/AR670W.dts
> @@ -39,6 +39,7 @@
>   			};
>   
>   			partition@40000 {
> +				compatible = "wrg";
>   				reg = <0x40000 0x3c0000>;
>   				label = "firmware";
>   			};
> diff --git a/target/linux/ramips/dts/DAP-1522-A1.dts b/target/linux/ramips/dts/DAP-1522-A1.dts
> index bdd63ea96b..aad706df2e 100644
> --- a/target/linux/ramips/dts/DAP-1522-A1.dts
> +++ b/target/linux/ramips/dts/DAP-1522-A1.dts
> @@ -40,6 +40,7 @@
>   			};
>   
>   			partition@40000 {
> +				compatible = "wrg";
>   				label = "firmware";
>   				reg = <0x40000 0x3a0000>;
>   			};
> diff --git a/target/linux/ramips/dts/WCR-1166DS.dts b/target/linux/ramips/dts/WCR-1166DS.dts
> index ca715c8ba5..b8e86e496c 100644
> --- a/target/linux/ramips/dts/WCR-1166DS.dts
> +++ b/target/linux/ramips/dts/WCR-1166DS.dts
> @@ -152,6 +152,7 @@
>   			};
>   
>   			partition@50000 {
> +				compatible = "openwrt,trx";
>   				label = "firmware";
>   				reg = <0x50000 0x7c0000>;
>   			};
> 

Hi Rafał,

I first made that commit in GitHub PR[1]. I thought that AR670W is using 
uImage because it is using wrg-header only for the factory and I wrote 
it as "uimage,denx" (it seems this was a misunderstanding).

After that, when checking by mkresin was done, the comment for AR670W 
was added into the commit message by him. At that time I was asked for a 
check, but I seem to have overlooked it.

Regards,
Hiroshi

[1]https://github.com/openwrt/openwrt/pull/1576
Mathias Kresin Dec. 14, 2018, 8 a.m. | #2
13/12/2018 17:16, Rafał Miłecki:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> It results in calling the right MTD parser directly instead of trying
> them one by one.
> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
> I'm not sure about the AR670W.dts. It seems to be using WRG according to
> the image generating code:
> IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn16a_airlink_ar670w

It's the sysupgrade.bin image which needs the LZMA splitter. After all 
the inheritance, the sysupgrade.bin image build code looks like:

   KERNEL := kernel-bin | patch-dtb | lzma | pad-to $$(BLOCKSIZE)
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | 
append-metadata | check-size $$$$(IMAGE_SIZE)

According to the message of the initial commit[0], it seems to be correct.

Mathias

[0] https://git.openwrt.org/cc5194cf030c422ef82442091598582cf4aeca34

Patch

diff --git a/target/linux/ramips/dts/AR670W.dts b/target/linux/ramips/dts/AR670W.dts
index 3ee39c1eb7..5f8a9a9593 100644
--- a/target/linux/ramips/dts/AR670W.dts
+++ b/target/linux/ramips/dts/AR670W.dts
@@ -39,6 +39,7 @@ 
 			};
 
 			partition@40000 {
+				compatible = "wrg";
 				reg = <0x40000 0x3c0000>;
 				label = "firmware";
 			};
diff --git a/target/linux/ramips/dts/DAP-1522-A1.dts b/target/linux/ramips/dts/DAP-1522-A1.dts
index bdd63ea96b..aad706df2e 100644
--- a/target/linux/ramips/dts/DAP-1522-A1.dts
+++ b/target/linux/ramips/dts/DAP-1522-A1.dts
@@ -40,6 +40,7 @@ 
 			};
 
 			partition@40000 {
+				compatible = "wrg";
 				label = "firmware";
 				reg = <0x40000 0x3a0000>;
 			};
diff --git a/target/linux/ramips/dts/WCR-1166DS.dts b/target/linux/ramips/dts/WCR-1166DS.dts
index ca715c8ba5..b8e86e496c 100644
--- a/target/linux/ramips/dts/WCR-1166DS.dts
+++ b/target/linux/ramips/dts/WCR-1166DS.dts
@@ -152,6 +152,7 @@ 
 			};
 
 			partition@50000 {
+				compatible = "openwrt,trx";
 				label = "firmware";
 				reg = <0x50000 0x7c0000>;
 			};