From: John Crispin <john@phrozen.org>
Date: Fri, 3 Apr 2020 09:49:42 +0000 (+0200)
Subject: mediatek: consolidate partition names and settings
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=beb9820ed3647c7bcd6a6082149305abfd53c389;p=openwrt%2Fstaging%2Fadrian.git

mediatek: consolidate partition names and settings

Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-elecom-wrc-2533gent.dts b/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-elecom-wrc-2533gent.dts
index 7a5814e3f6..3945f26e16 100644
--- a/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-elecom-wrc-2533gent.dts
+++ b/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-elecom-wrc-2533gent.dts
@@ -524,7 +524,7 @@
                         #size-cells = <1>;
 
                         partition@0 {
-                                label = "Preloader";
+                                label = "preloader";
                                 reg = <0x00000 0x0080000>;
                                 read-only;
                         };
@@ -554,7 +554,7 @@
                         };
 
                         partition@200000 {
-                                label = "Kernel";
+                                label = "firmware";
                                 reg = <0x200000 0x2000000>;
                         };
 
diff --git a/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-lynx-rfb1.dts b/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-lynx-rfb1.dts
index 1045851509..895491098e 100644
--- a/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-lynx-rfb1.dts
+++ b/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-lynx-rfb1.dts
@@ -526,7 +526,7 @@
                         #size-cells = <1>;
 
                         partition@0 {
-                                label = "Preloader";
+                                label = "preloader";
                                 reg = <0x00000 0x0080000>;
                                 read-only;
                         };
@@ -534,30 +534,34 @@
                         partition@80000 {
                                 label = "ATF";
                                 reg = <0x80000 0x0040000>;
+                                read-only;
                         };
 
                         partition@c0000 {
-                                label = "Bootloader";
+                                label = "uboot";
                                 reg = <0xc0000 0x0080000>;
+                                read-only;
                         };
 
                         partition@140000 {
-                                label = "Config";
+                                label = "uboot-env";
                                 reg = <0x140000 0x0080000>;
+                                read-only;
                         };
 
                         partition@1c0000 {
-                                label = "Factory";
+                                label = "factory";
                                 reg = <0x1c0000 0x0040000>;
+                                read-only;
                         };
 
                         partition@200000 {
-                                label = "Kernel";
+                                label = "firmware";
                                 reg = <0x200000 0x2000000>;
                         };
 
                         partition@2200000 {
-                                label = "User_data";
+                                label = "reserved";
                                 reg = <0x2200000 0x4000000>;
                         };
                 };
diff --git a/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
index ecd344c956..04829f6397 100644
--- a/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+++ b/target/linux/mediatek/files-4.19/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
@@ -526,7 +526,7 @@
                         #size-cells = <1>;
 
                         partition@0 {
-                                label = "Preloader";
+                                label = "preloader";
                                 reg = <0x00000 0x0080000>;
                                 read-only;
                         };
@@ -534,30 +534,34 @@
                         partition@80000 {
                                 label = "ATF";
                                 reg = <0x80000 0x0040000>;
+                                read-only;
                         };
 
                         partition@c0000 {
-                                label = "Bootloader";
+                                label = "uboot";
                                 reg = <0xc0000 0x0080000>;
+                                read-only;
                         };
 
                         partition@140000 {
-                                label = "Config";
+                                label = "uboot-env";
                                 reg = <0x140000 0x0080000>;
+                                read-only;
                         };
 
                         partition@1c0000 {
-                                label = "Factory";
+                                label = "factory";
                                 reg = <0x1c0000 0x0040000>;
+                                read-only;
                         };
 
                         partition@200000 {
-                                label = "Kernel";
+                                label = "firmware";
                                 reg = <0x200000 0x2000000>;
                         };
 
                         partition@2200000 {
-                                label = "User_data";
+                                label = "reserved";
                                 reg = <0x2200000 0x4000000>;
                         };
                 };
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7622-elecom-wrc-2533gent.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7622-elecom-wrc-2533gent.dts
index 7a5814e3f6..f178b94766 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7622-elecom-wrc-2533gent.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7622-elecom-wrc-2533gent.dts
@@ -554,7 +554,7 @@
                         };
 
                         partition@200000 {
-                                label = "Kernel";
+                                label = "firmware";
                                 reg = <0x200000 0x2000000>;
                         };
 
diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
index c5b4cf306b..42903f75a2 100755
--- a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
@@ -8,7 +8,7 @@ platform_do_upgrade() {
 	esac
 }
 
-PART_NAME=Kernel
+PART_NAME=firmware
 
 platform_check_image() {
 	local board=$(board_name)
diff --git a/target/linux/mediatek/mt7622/config-4.19 b/target/linux/mediatek/mt7622/config-4.19
index a6c492c43c..e102308a98 100644
--- a/target/linux/mediatek/mt7622/config-4.19
+++ b/target/linux/mediatek/mt7622/config-4.19
@@ -381,7 +381,6 @@ CONFIG_MTD_NAND_MTK=y
 CONFIG_MTD_SPI_NAND=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPLIT_FIRMWARE=y
-CONFIG_MTD_SPLIT_FIRMWARE_NAME="Kernel"
 CONFIG_MTD_SPLIT_FIT_FW=y
 CONFIG_MTD_SPLIT_UIMAGE_FW=y
 # CONFIG_MTK_AAL_SUPPORT is not set