From ab2a4c1e016ed7948362e7e37c47ac390d7623f2 Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Sat, 10 Sep 2022 15:48:22 -0500 Subject: [PATCH] realtek: rtl8380-tl-sg2xxx: use a single "firmware" partition The "firmware" partition was assembled from two contiguous partitions. This complexity is unnecessary. Instead of using mtd-concat over "sys" and "usrimg1", simply declare the "firmware" partition to cover the flash space instead. Signed-off-by: Alexandru Gagniuc --- .../dts-5.10/rtl8380_tplink_sg2xxx.dtsi | 29 +++---------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/target/linux/realtek/dts-5.10/rtl8380_tplink_sg2xxx.dtsi b/target/linux/realtek/dts-5.10/rtl8380_tplink_sg2xxx.dtsi index 20e96af2e7..8eb309d8a8 100644 --- a/target/linux/realtek/dts-5.10/rtl8380_tplink_sg2xxx.dtsi +++ b/target/linux/realtek/dts-5.10/rtl8380_tplink_sg2xxx.dtsi @@ -65,24 +65,6 @@ /* SGM706 specs: typical 1.6s, but minimum 1.0s. */ hw_margin_ms = <1000>; }; - - virtual_flash { - compatible = "mtd-concat"; - - devices = <&syspart &usrpart>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x0 0x1a00000>; - }; - }; - }; }; &gpio0 { @@ -116,13 +98,10 @@ label = "u-boot-env"; reg = <0xe0000 0x20000>; }; - syspart: partition@100000 { - label = "sys"; - reg = <0x100000 0x600000>; - }; - usrpart: partition@700000 { - label = "usrimg1"; - reg = <0x700000 0x1400000>; + partition@100000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x100000 0x1a00000>; }; partition@1b00000 { label = "usrappfs"; -- 2.30.2