author | Xindong Xu <xindong.xu@amlogic.com> | 2019-06-27 05:46:02 (GMT) |
---|---|---|
committer | Xindong Xu <xindong.xu@amlogic.com> | 2019-07-02 08:45:19 (GMT) |
commit | e1381f95b170033c668b93e2c03c5325f9e2eda3 (patch) | |
tree | 97d52d7060d93ee1e5b8956ef92ed97f0afffc26 | |
parent | e0d429b211f332bae32f7feffbbf2787945c0267 (diff) | |
download | common-e1381f95b170033c668b93e2c03c5325f9e2eda3.zip common-e1381f95b170033c668b93e2c03c5325f9e2eda3.tar.gz common-e1381f95b170033c668b93e2c03c5325f9e2eda3.tar.bz2 |
dts: add dtsi for dynamic partition [1/9]
PD#SWPL-6548
Problem:
android Q need to support dynamic partition
Solution:
add dtsi for dynamic partition
Verify:
franklin
Change-Id: I068d32a7377809cadd565ed123f725a905cd28fe
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
-rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 | ||||
-rw-r--r-- | MAINTAINERS | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/amlogic/firmware_avb_Q.dtsi | 52 | ||||
-rw-r--r-- | arch/arm/boot/dts/amlogic/firmware_normal_Q.dtsi | 52 | ||||
-rw-r--r-- | arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi | 106 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/firmware_avb_Q.dtsi | 52 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/firmware_normal_Q.dtsi | 52 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi | 106 |
8 files changed, 430 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 8a410b8..4be9eaf 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -31,6 +31,7 @@ android,fstab android,vbmeta android,vendor android,firmware +android,system apm Applied Micro Circuits Corporation (APM) aptina Aptina Imaging arasan Arasan Chip Systems diff --git a/MAINTAINERS b/MAINTAINERS index 0b11717..f392806 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14967,3 +14967,12 @@ ADD PARTITION DTSI FOR ANDROID Q M: Xindong Xu <xindong.xu@amlogic.com> F: arch/arm/boot/dts/amlogic/partition_mbox_normal_Q.dtsi F: arch/arm64/boot/dts/amlogic/partition_mbox_normal_Q.dtsi + +AMLOCIG DYNAMIC PARTITION DTSI +M: Xindong Xu <xindong.xu@amlogic.com> +F: arch/arm/boot/dts/amlogic/firmware_avb_Q.dtsi +F: arch/arm/boot/dts/amlogic/firmware_normal_Q.dtsi +F: arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi +F: arch/arm64/boot/dts/amlogic/firmware_avb_Q.dtsi +F: arch/arm64/boot/dts/amlogic/firmware_normal_Q.dtsi +F: arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi diff --git a/arch/arm/boot/dts/amlogic/firmware_avb_Q.dtsi b/arch/arm/boot/dts/amlogic/firmware_avb_Q.dtsi new file mode 100644 index 0000000..c5e61c4 --- a/dev/null +++ b/arch/arm/boot/dts/amlogic/firmware_avb_Q.dtsi @@ -0,0 +1,52 @@ +/* + * Amlogic partition set for normal + * + * Copyright (c) 2017-2017 Amlogic Ltd + * + * This file is licensed under a dual GPLv2 or BSD license. + * + */ +/ { + firmware { + android { + compatible = "android,firmware"; + vbmeta { + compatible = "android,vbmeta"; + parts = "vbmeta,boot,system,vendor"; + by_name_prefix="/dev/block"; + }; + fstab { + compatible = "android,fstab"; + system { + compatible = "android,system"; + dev = "system"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,avb=vbmeta,logical,first_stage_mount"; + }; + + vendor { + compatible = "android,vendor"; + dev = "vendor"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,avb,logical,first_stage_mount"; + }; + odm { + compatible = "android,odm"; + dev = "odm"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + product { + compatible = "android,product"; + dev = "product"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + }; + }; + }; +};/* end of / */ diff --git a/arch/arm/boot/dts/amlogic/firmware_normal_Q.dtsi b/arch/arm/boot/dts/amlogic/firmware_normal_Q.dtsi new file mode 100644 index 0000000..df618f9 --- a/dev/null +++ b/arch/arm/boot/dts/amlogic/firmware_normal_Q.dtsi @@ -0,0 +1,52 @@ +/* + * Amlogic partition set for normal + * + * Copyright (c) 2017-2017 Amlogic Ltd + * + * This file is licensed under a dual GPLv2 or BSD license. + * + */ +/ { + firmware { + android { + compatible = "android,firmware"; + vbmeta { + compatible = "android,vbmeta"; + parts = "vbmeta,boot,system,vendor"; + by_name_prefix="/dev/block"; + }; + fstab { + compatible = "android,fstab"; + system { + compatible = "android,system"; + dev = "system"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + + vendor { + compatible = "android,vendor"; + dev = "vendor"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + odm { + compatible = "android,odm"; + dev = "odm"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + product { + compatible = "android,product"; + dev = "product"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + }; + }; + }; +};/* end of / */ diff --git a/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi b/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi new file mode 100644 index 0000000..fc3d479 --- a/dev/null +++ b/arch/arm/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi @@ -0,0 +1,106 @@ +/* + * Amlogic partition set for normal + * + * Copyright (c) 2017-2017 Amlogic Ltd + * + * This file is licensed under a dual GPLv2 or BSD license. + * + */ + +#include "firmware_avb_Q.dtsi" + +/ { + partitions: partitions{ + parts = <14>; + part-0 = <&logo>; + part-1 = <&recovery>; + part-2 = <&misc>; + part-3 = <&dtbo>; + part-4 = <&cri_data>; + part-5 = <¶m>; + part-6 = <&boot>; + part-7 = <&rsv>; + part-8 = <&metadata>; + part-9 = <&vbmeta>; + part-10 = <&tee>; + part-11 = <&super>; + 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>; + }; + dtbo:dtbo{ + pname = "dtbo"; + 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>; + }; + metadata:metadata{ + pname = "metadata"; + size = <0x0 0x1000000>; + mask = <1>; + }; + vbmeta:vbmeta{ + pname = "vbmeta"; + size = <0x0 0x200000>; + 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 0x1000000>; + mask = <1>; + }; + super:super + { + pname = "super"; + size = <0x0 0x75000000>; + mask = <1>; + }; + cache:cache + { + pname = "cache"; + size = <0x0 0x46000000>; + mask = <2>; + }; + data:data + { + pname = "data"; + size = <0xffffffff 0xffffffff>; + mask = <4>; + }; + }; +};/* end of / */ diff --git a/arch/arm64/boot/dts/amlogic/firmware_avb_Q.dtsi b/arch/arm64/boot/dts/amlogic/firmware_avb_Q.dtsi new file mode 100644 index 0000000..c5e61c4 --- a/dev/null +++ b/arch/arm64/boot/dts/amlogic/firmware_avb_Q.dtsi @@ -0,0 +1,52 @@ +/* + * Amlogic partition set for normal + * + * Copyright (c) 2017-2017 Amlogic Ltd + * + * This file is licensed under a dual GPLv2 or BSD license. + * + */ +/ { + firmware { + android { + compatible = "android,firmware"; + vbmeta { + compatible = "android,vbmeta"; + parts = "vbmeta,boot,system,vendor"; + by_name_prefix="/dev/block"; + }; + fstab { + compatible = "android,fstab"; + system { + compatible = "android,system"; + dev = "system"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,avb=vbmeta,logical,first_stage_mount"; + }; + + vendor { + compatible = "android,vendor"; + dev = "vendor"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,avb,logical,first_stage_mount"; + }; + odm { + compatible = "android,odm"; + dev = "odm"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + product { + compatible = "android,product"; + dev = "product"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + }; + }; + }; +};/* end of / */ diff --git a/arch/arm64/boot/dts/amlogic/firmware_normal_Q.dtsi b/arch/arm64/boot/dts/amlogic/firmware_normal_Q.dtsi new file mode 100644 index 0000000..df618f9 --- a/dev/null +++ b/arch/arm64/boot/dts/amlogic/firmware_normal_Q.dtsi @@ -0,0 +1,52 @@ +/* + * Amlogic partition set for normal + * + * Copyright (c) 2017-2017 Amlogic Ltd + * + * This file is licensed under a dual GPLv2 or BSD license. + * + */ +/ { + firmware { + android { + compatible = "android,firmware"; + vbmeta { + compatible = "android,vbmeta"; + parts = "vbmeta,boot,system,vendor"; + by_name_prefix="/dev/block"; + }; + fstab { + compatible = "android,fstab"; + system { + compatible = "android,system"; + dev = "system"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + + vendor { + compatible = "android,vendor"; + dev = "vendor"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + odm { + compatible = "android,odm"; + dev = "odm"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + product { + compatible = "android,product"; + dev = "product"; + type = "ext4"; + mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; + fsmgr_flags = "wait,logical,first_stage_mount"; + }; + }; + }; + }; +};/* end of / */ diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi new file mode 100644 index 0000000..fc3d479 --- a/dev/null +++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_dynamic.dtsi @@ -0,0 +1,106 @@ +/* + * Amlogic partition set for normal + * + * Copyright (c) 2017-2017 Amlogic Ltd + * + * This file is licensed under a dual GPLv2 or BSD license. + * + */ + +#include "firmware_avb_Q.dtsi" + +/ { + partitions: partitions{ + parts = <14>; + part-0 = <&logo>; + part-1 = <&recovery>; + part-2 = <&misc>; + part-3 = <&dtbo>; + part-4 = <&cri_data>; + part-5 = <¶m>; + part-6 = <&boot>; + part-7 = <&rsv>; + part-8 = <&metadata>; + part-9 = <&vbmeta>; + part-10 = <&tee>; + part-11 = <&super>; + 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>; + }; + dtbo:dtbo{ + pname = "dtbo"; + 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>; + }; + metadata:metadata{ + pname = "metadata"; + size = <0x0 0x1000000>; + mask = <1>; + }; + vbmeta:vbmeta{ + pname = "vbmeta"; + size = <0x0 0x200000>; + 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 0x1000000>; + mask = <1>; + }; + super:super + { + pname = "super"; + size = <0x0 0x75000000>; + mask = <1>; + }; + cache:cache + { + pname = "cache"; + size = <0x0 0x46000000>; + mask = <2>; + }; + data:data + { + pname = "data"; + size = <0xffffffff 0xffffffff>; + mask = <4>; + }; + }; +};/* end of / */ |