dts: adjust partition table for Android 8.0 [1/2]

PD#149137: dts: adjust partition table for Android 8.0

1. delete crypt
2. change tee to 32M
3. add param 16M
4. add cri_data 8M
5. add dto 8M
6. change logo to 8M
7. change misc to 8M
8. change boot to 16M
9. change recovery to 24M
10. change system to 1856M
11. change cache to 1120M

Change-Id: Ice80dee7736a127c555cac641bc3a8874aeb519e
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
This commit is contained in:
Xindong Xu
2017-08-11 14:38:48 +08:00
committed by Jianxin Pan
parent b099141ced
commit f6e964fdda
9 changed files with 227 additions and 476 deletions

View File

@@ -14052,3 +14052,7 @@ AMLOGIC multimedia
M: Nanxin Qin <nanxin.qin@amlogic.com>
F: drivers/amlogic/media/common/codec_mm/configs/*
AMLOGIC ADD PARTITION NORMAL & AB DTS
M: Xindong Xu <xindong.xu@amlogic.com>
F: arch/arm64/boot/dts/amlogic/partition_mbox_ab.dtsi
F: arch/arm64/boot/dts/amlogic/partition_mbox_normal.dtsi

View File

@@ -18,6 +18,7 @@
/dts-v1/;
#include "mesongxl.dtsi"
#include "partition_mbox_normal.dtsi"
/ {
model = "Amlogic";
amlogic-dt-id = "gxl_p212_1g";
@@ -896,88 +897,6 @@
};
};
partitions: partitions{
parts = <12>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&rsv>;
part-3 = <&tee>;
part-4 = <&crypt>;
part-5 = <&misc>;
part-6 = <&boot>;
part-7 = <&system>;
part-8 = <&cache>;
part-9 = <&vendor>;
part-10 = <&odm>;
part-11 = <&data>;
logo:logo{
pname = "logo";
size = <0x0 0x2000000>;
mask = <1>;
};
recovery:recovery{
pname = "recovery";
size = <0x0 0x2000000>;
mask = <1>;
};
rsv:rsv{
pname = "rsv";
size = <0x0 0x800000>;
mask = <1>;
};
tee:tee{
pname = "tee";
size = <0x0 0x800000>;
mask = <1>;
};
crypt:crypt{
pname = "crypt";
size = <0x0 0x2000000>;
mask = <1>;
};
misc:misc{
pname = "misc";
size = <0x0 0x2000000>;
mask = <1>;
};
boot:boot
{
pname = "boot";
size = <0x0 0x2000000>;
mask = <1>;
};
system:system
{
pname = "system";
size = <0x0 0x80000000>;
mask = <1>;
};
vendor:vendor
{
pname = "vendor";
size = <0x0 0x10000000>;
mask = <1>;
};
odm:odm
{
pname = "odm";
size = <0x0 0x10000000>;
mask = <1>;
};
cache:cache
{
pname = "cache";
size = <0x0 0x20000000>;
mask = <2>;
};
data:data
{
pname = "data";
size = <0xffffffff 0xffffffff>;
mask = <4>;
};
};
ppmgr {
compatible = "amlogic, ppmgr";

View File

@@ -19,6 +19,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "mesongxl.dtsi"
#include "partition_mbox_normal.dtsi"
/ {
model = "Amlogic";
amlogic-dt-id = "gxl_p212_2g";
@@ -905,88 +906,6 @@
};
};
partitions: partitions{
parts = <12>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&rsv>;
part-3 = <&tee>;
part-4 = <&crypt>;
part-5 = <&misc>;
part-6 = <&boot>;
part-7 = <&system>;
part-8 = <&cache>;
part-9 = <&vendor>;
part-10 = <&odm>;
part-11 = <&data>;
logo:logo{
pname = "logo";
size = <0x0 0x2000000>;
mask = <1>;
};
recovery:recovery{
pname = "recovery";
size = <0x0 0x2000000>;
mask = <1>;
};
rsv:rsv{
pname = "rsv";
size = <0x0 0x800000>;
mask = <1>;
};
tee:tee{
pname = "tee";
size = <0x0 0x800000>;
mask = <1>;
};
crypt:crypt{
pname = "crypt";
size = <0x0 0x2000000>;
mask = <1>;
};
misc:misc{
pname = "misc";
size = <0x0 0x2000000>;
mask = <1>;
};
boot:boot
{
pname = "boot";
size = <0x0 0x2000000>;
mask = <1>;
};
system:system
{
pname = "system";
size = <0x0 0x80000000>;
mask = <1>;
};
vendor:vendor
{
pname = "vendor";
size = <0x0 0x10000000>;
mask = <1>;
};
odm:odm
{
pname = "odm";
size = <0x0 0x10000000>;
mask = <1>;
};
cache:cache
{
pname = "cache";
size = <0x0 0x20000000>;
mask = <2>;
};
data:data
{
pname = "data";
size = <0xffffffff 0xffffffff>;
mask = <4>;
};
};
ppmgr {
compatible = "amlogic, ppmgr";

View File

@@ -19,6 +19,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "mesongxl.dtsi"
#include "partition_mbox_normal.dtsi"
/ {
model = "Amlogic";
amlogic-dt-id = "gxl_p230_2g";
@@ -889,80 +890,6 @@
};
};
partitions: partitions{
parts = <11>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&rsv>;
part-3 = <&tee>;
part-4 = <&crypt>;
part-5 = <&misc>;
part-6 = <&instaboot>;
part-7 = <&boot>;
part-8 = <&system>;
part-9 = <&cache>;
part-10 = <&data>;
logo:logo{
pname = "logo";
size = <0x0 0x2000000>;
mask = <1>;
};
recovery:recovery{
pname = "recovery";
size = <0x0 0x2000000>;
mask = <1>;
};
rsv:rsv{
pname = "rsv";
size = <0x0 0x800000>;
mask = <1>;
};
tee:tee{
pname = "tee";
size = <0x0 0x800000>;
mask = <1>;
};
crypt:crypt{
pname = "crypt";
size = <0x0 0x2000000>;
mask = <1>;
};
misc:misc{
pname = "misc";
size = <0x0 0x2000000>;
mask = <1>;
};
instaboot:instaboot{
pname = "instaboot";
size = <0x0 0x400000>;
mask = <1>;
};
boot:boot
{
pname = "boot";
size = <0x0 0x2000000>;
mask = <1>;
};
system:system
{
pname = "system";
size = <0x0 0x80000000>;
mask = <1>;
};
cache:cache
{
pname = "cache";
size = <0x0 0x20000000>;
mask = <2>;
};
data:data
{
pname = "data";
size = <0xffffffff 0xffffffff>;
mask = <4>;
};
};
ppmgr {
compatible = "amlogic, ppmgr";

View File

@@ -19,6 +19,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "mesongxl.dtsi"
#include "partition_mbox_normal.dtsi"
/ {
model = "Amlogic";
amlogic-dt-id = "gxl_p231_1g";
@@ -834,88 +835,6 @@
};
};
partitions: partitions{
parts = <12>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&rsv>;
part-3 = <&tee>;
part-4 = <&crypt>;
part-5 = <&misc>;
part-6 = <&boot>;
part-7 = <&system>;
part-8 = <&cache>;
part-9 = <&vendor>;
part-10 = <&odm>;
part-11 = <&data>;
logo:logo{
pname = "logo";
size = <0x0 0x2000000>;
mask = <1>;
};
recovery:recovery{
pname = "recovery";
size = <0x0 0x2000000>;
mask = <1>;
};
rsv:rsv{
pname = "rsv";
size = <0x0 0x800000>;
mask = <1>;
};
tee:tee{
pname = "tee";
size = <0x0 0x800000>;
mask = <1>;
};
crypt:crypt{
pname = "crypt";
size = <0x0 0x2000000>;
mask = <1>;
};
misc:misc{
pname = "misc";
size = <0x0 0x2000000>;
mask = <1>;
};
boot:boot
{
pname = "boot";
size = <0x0 0x2000000>;
mask = <1>;
};
system:system
{
pname = "system";
size = <0x0 0x80000000>;
mask = <1>;
};
vendor:vendor
{
pname = "vendor";
size = <0x0 0x10000000>;
mask = <1>;
};
odm:odm
{
pname = "odm";
size = <0x0 0x10000000>;
mask = <1>;
};
cache:cache
{
pname = "cache";
size = <0x0 0x20000000>;
mask = <2>;
};
data:data
{
pname = "data";
size = <0xffffffff 0xffffffff>;
mask = <4>;
};
};
ppmgr {
compatible = "amlogic, ppmgr";

View File

@@ -19,6 +19,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "mesongxl.dtsi"
#include "partition_mbox_normal.dtsi"
/ {
model = "Amlogic";
amlogic-dt-id = "gxl_p231_2g";
@@ -834,88 +835,6 @@
};
};
partitions: partitions{
parts = <12>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&rsv>;
part-3 = <&tee>;
part-4 = <&crypt>;
part-5 = <&misc>;
part-6 = <&boot>;
part-7 = <&system>;
part-8 = <&cache>;
part-9 = <&vendor>;
part-10 = <&odm>;
part-11 = <&data>;
logo:logo{
pname = "logo";
size = <0x0 0x2000000>;
mask = <1>;
};
recovery:recovery{
pname = "recovery";
size = <0x0 0x2000000>;
mask = <1>;
};
rsv:rsv{
pname = "rsv";
size = <0x0 0x800000>;
mask = <1>;
};
tee:tee{
pname = "tee";
size = <0x0 0x800000>;
mask = <1>;
};
crypt:crypt{
pname = "crypt";
size = <0x0 0x2000000>;
mask = <1>;
};
misc:misc{
pname = "misc";
size = <0x0 0x2000000>;
mask = <1>;
};
boot:boot
{
pname = "boot";
size = <0x0 0x2000000>;
mask = <1>;
};
system:system
{
pname = "system";
size = <0x0 0x80000000>;
mask = <1>;
};
vendor:vendor
{
pname = "vendor";
size = <0x0 0x10000000>;
mask = <1>;
};
odm:odm
{
pname = "odm";
size = <0x0 0x10000000>;
mask = <1>;
};
cache:cache
{
pname = "cache";
size = <0x0 0x20000000>;
mask = <2>;
};
data:data
{
pname = "data";
size = <0xffffffff 0xffffffff>;
mask = <4>;
};
};
ppmgr {
compatible = "amlogic, ppmgr";

View File

@@ -18,6 +18,7 @@
/dts-v1/;
#include "mesongxm.dtsi"
#include "partition_mbox_normal.dtsi"
/ {
model = "Amlogic";
amlogic-dt-id = "gxm_q200_2g";
@@ -921,80 +922,6 @@
};
};
partitions: partitions{
parts = <11>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&rsv>;
part-3 = <&tee>;
part-4 = <&crypt>;
part-5 = <&misc>;
part-6 = <&instaboot>;
part-7 = <&boot>;
part-8 = <&system>;
part-9 = <&cache>;
part-10 = <&data>;
logo:logo{
pname = "logo";
size = <0x0 0x2000000>;
mask = <1>;
};
recovery:recovery{
pname = "recovery";
size = <0x0 0x2000000>;
mask = <1>;
};
rsv:rsv{
pname = "rsv";
size = <0x0 0x800000>;
mask = <1>;
};
tee:tee{
pname = "tee";
size = <0x0 0x800000>;
mask = <1>;
};
crypt:crypt{
pname = "crypt";
size = <0x0 0x2000000>;
mask = <1>;
};
misc:misc{
pname = "misc";
size = <0x0 0x2000000>;
mask = <1>;
};
instaboot:instaboot{
pname = "instaboot";
size = <0x0 0x400000>;
mask = <1>;
};
boot:boot
{
pname = "boot";
size = <0x0 0x2000000>;
mask = <1>;
};
system:system
{
pname = "system";
size = <0x0 0x80000000>;
mask = <1>;
};
cache:cache
{
pname = "cache";
size = <0x0 0x20000000>;
mask = <2>;
};
data:data
{
pname = "data";
size = <0xffffffff 0xffffffff>;
mask = <4>;
};
};
ppmgr {
compatible = "amlogic, ppmgr";

View File

@@ -0,0 +1,112 @@
/*
* Amlogic partition set for normal
*
* Copyright (c) 2017-2017 Amlogic Ltd
*
* This file is licensed under a dual GPLv2 or BSD license.
*
*/
/ {
partitions: partitions{
parts = <15>;
part-0 = <&logo>;
part-1 = <&boot_a>;
part-2 = <&rsv>;
part-3 = <&tee>;
part-4 = <&param>
part-5 = <&misc>;
part-6 = <&boot_b>;
part-7 = <&system_a>;
part-8 = <&system_b>;
part-9 = <&vendor_a>;
part-10 = <&vendor_b>;
part-11 = <&odm>;
part-12 = <&cache>;
part-13 = <&cri_data>;
part-14 = <&data>;
logo:logo{
pname = "logo";
size = <0x0 0x2000000>;
mask = <1>;
};
boot_a:boot_a{
pname = "boot_a";
size = <0x0 0x2000000>;
mask = <1>;
};
rsv:rsv{
pname = "rsv";
size = <0x0 0x1000000>;
mask = <1>;
};
tee:tee{
pname = "tee";
size = <0x0 0x2000000>;
mask = <1>;
};
param:param{
pname = "param";
size = <0x0 0x1000000>;
mask = <2>;
};
misc:misc{
pname = "misc";
size = <0x0 0x2000000>;
mask = <1>;
};
boot_b:boot_b
{
pname = "boot_b";
size = <0x0 0x2000000>;
mask = <1>;
};
system_a:system_a
{
pname = "system_a";
size = <0x0 0x80000000>;
mask = <1>;
};
system_b:system_b
{
pname = "system_b";
size = <0x0 0x80000000>;
mask = <1>;
};
vendor_a:vendor_a
{
pname = "vendor_a";
size = <0x0 0x10000000>;
mask = <1>;
};
vendor_b:vendor_b
{
pname = "vendor_b";
size = <0x0 0x10000000>;
mask = <1>;
};
odm:odm
{
pname = "odm";
size = <0x0 0x10000000>;
mask = <1>;
};
cache:cache{
pname = "cache";
size = <0x0 0x10000000>;
mask = <1>;
};
cri_data:cri_data
{
pname = "cri_data";
size = <0x0 0x800000>;
mask = <2>;
};
data:data
{
pname = "data";
size = <0xffffffff 0xffffffff>;
mask = <4>;
};
};
};/* end of / */

View File

@@ -0,0 +1,105 @@
/*
* Amlogic partition set for normal
*
* Copyright (c) 2017-2017 Amlogic Ltd
*
* This file is licensed under a dual GPLv2 or BSD license.
*
*/
/ {
partitions: partitions{
parts = <14>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&misc>;
part-3 = <&dto>;
part-4 = <&cri_data>;
part-5 = <&param>;
part-6 = <&boot>;
part-7 = <&rsv>;
part-8 = <&tee>;
part-9 = <&vendor>;
part-10 = <&odm>;
part-11 = <&system>;
part-12 = <&cache>;
part-13 = <&data>;
logo:logo{
pname = "logo";
size = <0x0 0x800000>;
mask = <1>;
};
recovery:recovery{
pname = "recovery";
size = <0x0 0x1800000>;
mask = <1>;
};
misc:misc{
pname = "misc";
size = <0x0 0x800000>;
mask = <1>;
};
dto:dto{
pname = "dto";
size = <0x0 0x800000>;
mask = <1>;
};
cri_data:cri_data
{
pname = "cri_data";
size = <0x0 0x800000>;
mask = <2>;
};
rsv:rsv{
pname = "rsv";
size = <0x0 0x1000000>;
mask = <1>;
};
param:param{
pname = "param";
size = <0x0 0x1000000>;
mask = <2>;
};
boot:boot
{
pname = "boot";
size = <0x0 0x1000000>;
mask = <1>;
};
tee:tee{
pname = "tee";
size = <0x0 0x2000000>;
mask = <1>;
};
vendor:vendor
{
pname = "vendor";
size = <0x0 0x10000000>;
mask = <1>;
};
odm:odm
{
pname = "odm";
size = <0x0 0x10000000>;
mask = <1>;
};
system:system
{
pname = "system";
size = <0x0 0x74000000>;
mask = <1>;
};
cache:cache
{
pname = "cache";
size = <0x0 0x46000000>;
mask = <2>;
};
data:data
{
pname = "data";
size = <0xffffffff 0xffffffff>;
mask = <4>;
};
};
};/* end of / */