mediatek: consolidate partition names and settings

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2020-04-03 11:49:42 +02:00
parent bce39e1d00
commit beb9820ed3
6 changed files with 24 additions and 17 deletions

View File

@ -524,7 +524,7 @@
#size-cells = <1>; #size-cells = <1>;
partition@0 { partition@0 {
label = "Preloader"; label = "preloader";
reg = <0x00000 0x0080000>; reg = <0x00000 0x0080000>;
read-only; read-only;
}; };
@ -554,7 +554,7 @@
}; };
partition@200000 { partition@200000 {
label = "Kernel"; label = "firmware";
reg = <0x200000 0x2000000>; reg = <0x200000 0x2000000>;
}; };

View File

@ -526,7 +526,7 @@
#size-cells = <1>; #size-cells = <1>;
partition@0 { partition@0 {
label = "Preloader"; label = "preloader";
reg = <0x00000 0x0080000>; reg = <0x00000 0x0080000>;
read-only; read-only;
}; };
@ -534,30 +534,34 @@
partition@80000 { partition@80000 {
label = "ATF"; label = "ATF";
reg = <0x80000 0x0040000>; reg = <0x80000 0x0040000>;
read-only;
}; };
partition@c0000 { partition@c0000 {
label = "Bootloader"; label = "uboot";
reg = <0xc0000 0x0080000>; reg = <0xc0000 0x0080000>;
read-only;
}; };
partition@140000 { partition@140000 {
label = "Config"; label = "uboot-env";
reg = <0x140000 0x0080000>; reg = <0x140000 0x0080000>;
read-only;
}; };
partition@1c0000 { partition@1c0000 {
label = "Factory"; label = "factory";
reg = <0x1c0000 0x0040000>; reg = <0x1c0000 0x0040000>;
read-only;
}; };
partition@200000 { partition@200000 {
label = "Kernel"; label = "firmware";
reg = <0x200000 0x2000000>; reg = <0x200000 0x2000000>;
}; };
partition@2200000 { partition@2200000 {
label = "User_data"; label = "reserved";
reg = <0x2200000 0x4000000>; reg = <0x2200000 0x4000000>;
}; };
}; };

View File

@ -526,7 +526,7 @@
#size-cells = <1>; #size-cells = <1>;
partition@0 { partition@0 {
label = "Preloader"; label = "preloader";
reg = <0x00000 0x0080000>; reg = <0x00000 0x0080000>;
read-only; read-only;
}; };
@ -534,30 +534,34 @@
partition@80000 { partition@80000 {
label = "ATF"; label = "ATF";
reg = <0x80000 0x0040000>; reg = <0x80000 0x0040000>;
read-only;
}; };
partition@c0000 { partition@c0000 {
label = "Bootloader"; label = "uboot";
reg = <0xc0000 0x0080000>; reg = <0xc0000 0x0080000>;
read-only;
}; };
partition@140000 { partition@140000 {
label = "Config"; label = "uboot-env";
reg = <0x140000 0x0080000>; reg = <0x140000 0x0080000>;
read-only;
}; };
partition@1c0000 { partition@1c0000 {
label = "Factory"; label = "factory";
reg = <0x1c0000 0x0040000>; reg = <0x1c0000 0x0040000>;
read-only;
}; };
partition@200000 { partition@200000 {
label = "Kernel"; label = "firmware";
reg = <0x200000 0x2000000>; reg = <0x200000 0x2000000>;
}; };
partition@2200000 { partition@2200000 {
label = "User_data"; label = "reserved";
reg = <0x2200000 0x4000000>; reg = <0x2200000 0x4000000>;
}; };
}; };

View File

@ -554,7 +554,7 @@
}; };
partition@200000 { partition@200000 {
label = "Kernel"; label = "firmware";
reg = <0x200000 0x2000000>; reg = <0x200000 0x2000000>;
}; };

View File

@ -8,7 +8,7 @@ platform_do_upgrade() {
esac esac
} }
PART_NAME=Kernel PART_NAME=firmware
platform_check_image() { platform_check_image() {
local board=$(board_name) local board=$(board_name)

View File

@ -381,7 +381,6 @@ CONFIG_MTD_NAND_MTK=y
CONFIG_MTD_SPI_NAND=y CONFIG_MTD_SPI_NAND=y
CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_FIRMWARE=y
CONFIG_MTD_SPLIT_FIRMWARE_NAME="Kernel"
CONFIG_MTD_SPLIT_FIT_FW=y CONFIG_MTD_SPLIT_FIT_FW=y
CONFIG_MTD_SPLIT_UIMAGE_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y
# CONFIG_MTK_AAL_SUPPORT is not set # CONFIG_MTK_AAL_SUPPORT is not set