From 623973a7111b95d1faaedb60b554ef0160251751 Mon Sep 17 00:00:00 2001 From: Xindong Xu Date: Wed, 27 Nov 2019 10:00:03 +0800 Subject: [PATCH] partiton: change Q partition table [1/7] PD#SWPL-17483 Problem: partition size is not enough Solution: 1. add factory partition 2. change tee size to 32MB Verify: newton Change-Id: I0a8cb2695fb67d1d6200f70864b31fcd7cee57bc Signed-off-by: Xindong Xu --- .../partition_mbox_normal_dynamic.dtsi | 34 +++++++++------- .../partition_mbox_normal_dynamic_ab.dtsi | 40 +++++++++++-------- .../partition_mbox_normal_dynamic.dtsi | 34 +++++++++------- .../partition_mbox_normal_dynamic_ab.dtsi | 40 +++++++++++-------- 4 files changed, 86 insertions(+), 62 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi b/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi index 89f83d2b80d9..2a92bcc939b9 100644 --- a/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi +++ b/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi @@ -11,21 +11,22 @@ / { partitions: partitions{ - parts = <14>; + parts = <15>; part-0 = <&logo>; part-1 = <&recovery>; part-2 = <&tee>; - part-3 = <&misc>; - part-4 = <&dtbo>; - part-5 = <&cri_data>; - part-6 = <¶m>; - part-7 = <&boot>; - part-8 = <&rsv>; - part-9 = <&metadata>; - part-10 = <&vbmeta>; - part-11 = <&super>; - part-12 = <&cache>; - part-13 = <&data>; + part-3 = <&factory>; + part-4 = <&misc>; + part-5 = <&dtbo>; + part-6 = <&cri_data>; + part-7 = <¶m>; + part-8 = <&boot>; + part-9 = <&rsv>; + part-10 = <&metadata>; + part-11 = <&vbmeta>; + part-12 = <&super>; + part-13 = <&cache>; + part-14 = <&data>; logo:logo{ pname = "logo"; @@ -39,7 +40,12 @@ }; tee:tee{ pname = "tee"; - size = <0x0 0x400000>; + size = <0x0 0x2000000>; + mask = <1>; + }; + factory:factory{ + pname = "factory"; + size = <0x0 0x800000>; mask = <1>; }; misc:misc{ @@ -87,7 +93,7 @@ super:super { pname = "super"; - size = <0x0 0x78000000>; + size = <0x0 0x64000000>; mask = <1>; }; cache:cache diff --git a/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic_ab.dtsi b/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic_ab.dtsi index 1ba6b793a9fe..c55324e3dcf9 100644 --- a/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic_ab.dtsi +++ b/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic_ab.dtsi @@ -11,25 +11,26 @@ / { partitions: partitions{ - parts = <18>; + parts = <19>; part-0 = <&logo>; part-1 = <&recovery_a>; part-2 = <&recovery_b>; part-3 = <&tee>; - part-4 = <&misc>; - part-5 = <&dtbo_a>; - part-6 = <&dtbo_b>; - part-7 = <&cri_data>; - part-8 = <¶m>; - part-9 = <&boot_a>; - part-10 = <&boot_b>; - part-11 = <&rsv>; - part-12 = <&metadata_a>; - part-13 = <&metadata_b>; - part-14 = <&vbmeta_a>; - part-15 = <&vbmeta_b>; - part-16 = <&super>; - part-17 = <&data>; + part-4 = <&factory>; + part-5 = <&misc>; + part-6 = <&dtbo_a>; + part-7 = <&dtbo_b>; + part-8 = <&cri_data>; + part-9 = <¶m>; + part-10 = <&boot_a>; + part-11 = <&boot_b>; + part-12 = <&rsv>; + part-13 = <&metadata_a>; + part-14 = <&metadata_b>; + part-15 = <&vbmeta_a>; + part-16 = <&vbmeta_b>; + part-17 = <&super>; + part-18 = <&data>; logo:logo{ pname = "logo"; @@ -48,7 +49,12 @@ }; tee:tee{ pname = "tee"; - size = <0x0 0x400000>; + size = <0x0 0x2000000>; + mask = <1>; + }; + factory:factory{ + pname = "factory"; + size = <0x0 0x800000>; mask = <1>; }; misc:misc{ @@ -117,7 +123,7 @@ super:super { pname = "super"; - size = <0x0 0xF0800000>; + size = <0x0 0xC8800000>; mask = <1>; }; data:data diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi index 89f83d2b80d9..2a92bcc939b9 100644 --- a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi +++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi @@ -11,21 +11,22 @@ / { partitions: partitions{ - parts = <14>; + parts = <15>; part-0 = <&logo>; part-1 = <&recovery>; part-2 = <&tee>; - part-3 = <&misc>; - part-4 = <&dtbo>; - part-5 = <&cri_data>; - part-6 = <¶m>; - part-7 = <&boot>; - part-8 = <&rsv>; - part-9 = <&metadata>; - part-10 = <&vbmeta>; - part-11 = <&super>; - part-12 = <&cache>; - part-13 = <&data>; + part-3 = <&factory>; + part-4 = <&misc>; + part-5 = <&dtbo>; + part-6 = <&cri_data>; + part-7 = <¶m>; + part-8 = <&boot>; + part-9 = <&rsv>; + part-10 = <&metadata>; + part-11 = <&vbmeta>; + part-12 = <&super>; + part-13 = <&cache>; + part-14 = <&data>; logo:logo{ pname = "logo"; @@ -39,7 +40,12 @@ }; tee:tee{ pname = "tee"; - size = <0x0 0x400000>; + size = <0x0 0x2000000>; + mask = <1>; + }; + factory:factory{ + pname = "factory"; + size = <0x0 0x800000>; mask = <1>; }; misc:misc{ @@ -87,7 +93,7 @@ super:super { pname = "super"; - size = <0x0 0x78000000>; + size = <0x0 0x64000000>; mask = <1>; }; cache:cache diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic_ab.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic_ab.dtsi index 1ba6b793a9fe..c55324e3dcf9 100644 --- a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic_ab.dtsi +++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic_ab.dtsi @@ -11,25 +11,26 @@ / { partitions: partitions{ - parts = <18>; + parts = <19>; part-0 = <&logo>; part-1 = <&recovery_a>; part-2 = <&recovery_b>; part-3 = <&tee>; - part-4 = <&misc>; - part-5 = <&dtbo_a>; - part-6 = <&dtbo_b>; - part-7 = <&cri_data>; - part-8 = <¶m>; - part-9 = <&boot_a>; - part-10 = <&boot_b>; - part-11 = <&rsv>; - part-12 = <&metadata_a>; - part-13 = <&metadata_b>; - part-14 = <&vbmeta_a>; - part-15 = <&vbmeta_b>; - part-16 = <&super>; - part-17 = <&data>; + part-4 = <&factory>; + part-5 = <&misc>; + part-6 = <&dtbo_a>; + part-7 = <&dtbo_b>; + part-8 = <&cri_data>; + part-9 = <¶m>; + part-10 = <&boot_a>; + part-11 = <&boot_b>; + part-12 = <&rsv>; + part-13 = <&metadata_a>; + part-14 = <&metadata_b>; + part-15 = <&vbmeta_a>; + part-16 = <&vbmeta_b>; + part-17 = <&super>; + part-18 = <&data>; logo:logo{ pname = "logo"; @@ -48,7 +49,12 @@ }; tee:tee{ pname = "tee"; - size = <0x0 0x400000>; + size = <0x0 0x2000000>; + mask = <1>; + }; + factory:factory{ + pname = "factory"; + size = <0x0 0x800000>; mask = <1>; }; misc:misc{ @@ -117,7 +123,7 @@ super:super { pname = "super"; - size = <0x0 0xF0800000>; + size = <0x0 0xC8800000>; mask = <1>; }; data:data -- 2.20.1