ARM64: dts: devkits*: Return to standard DTS without fstab mounting

It must be properly handled with the fstab in the first stage ramdisk,
just like the other targets.

This reverts commits 831cf5201a191c09fce160e7852f96ae76d8035c and 9ed028ffa92f0bb67b5a3b87bb19068ae58e278e.

Change-Id: I9d4085a2e609305f1d53eb1104f201b207ab59dd

diff --git a/arch/arm64/boot/dts/amlogic/firmware_deadpool.dtsi b/arch/arm64/boot/dts/amlogic/firmware_deadpool.dtsi
deleted file mode 100644 (file)
index 6f741bb..0000000
--- a/arch/arm64/boot/dts/amlogic/firmware_deadpool.dtsi
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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";
-                               };
-                       metadata {
-                               compatible = "android,metadata";
-                               dev = "/dev/block/metadata";
-                               type = "ext4";
-                               mnt_flags = "noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic";
-                               fsmgr_flags = "wait,check,formattable,first_stage_mount";
-                               };
-                       };
-               };
-       };
-};/* end of / */

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts
index 38dc8170c23593a364481f74a99bb9ac79b98477..96a7ce928c57d3b8d791f8f11e634005cd419611 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a_deadpool.dtsi"
-#include "partition_mbox_dynamic_deadpool_noavb.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
        model = "Amlogic";

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0_4g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0_4g.dts
index 0ff81ab292c6b4c1499e7b1ffe395e9d13837e3d..5874f266ea7c74e80d9e68fb8fddae5f2114f192 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0_4g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0_4g.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a_deadpool.dtsi"
-#include "partition_mbox_dynamic_deadpool_noavb.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
        model = "Amlogic";

diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_dynamic_deadpool_noavb.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_dynamic_deadpool_noavb.dtsi
deleted file mode 100644 (file)
index bef3701..0000000
--- a/arch/arm64/boot/dts/amlogic/partition_mbox_dynamic_deadpool_noavb.dtsi
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Amlogic partition set for normal
- *
- * Copyright (c) 2017-2017 Amlogic Ltd
- *
- * This file is licensed under a dual GPLv2 or BSD license.
- *
- */
-
-#include "firmware_deadpool.dtsi"
-
-/ {
-    partitions: partitions{
-               parts = <15>;
-               part-0 = <&logo>;
-               part-1 = <&recovery>;
-               part-2 = <&misc>;
-               part-3 = <&dtbo>;
-               part-4 = <&cri_data>;
-               part-5 = <&param>;
-               part-6 = <&boot>;
-               part-7 = <&frp>;
-               part-8 = <&rsv>;
-               part-9 = <&metadata>;
-               part-10 = <&vbmeta>;
-               part-11 = <&tee>;
-               part-12 = <&super>;
-               part-13 = <&cache>;
-               part-14 = <&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>;
-               };
-               frp:frp{
-                       pname = "frp";
-                       size = <0x0 0x200000>;
-                       mask = <1>;
-               };
-               rsv:rsv{
-                       pname = "rsv";
-                       size = <0x0 0x600000>;
-                       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 0x2000000>;
-                       mask = <1>;
-               };
-               super:super
-               {
-                       pname = "super";
-                       size = <0x0 0x7C400000>;
-                       mask = <1>;
-               };
-               cache:cache
-               {
-                       pname = "cache";
-                       size = <0x0 0x32000000>;
-                       mask = <2>;
-               };
-               data:data
-               {
-                       pname = "data";
-                       size = <0xffffffff 0xffffffff>;
-                       mask = <4>;
-               };
-       };
-};/* end of / */

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts b/arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts
index bd948ba5c3f3a2131db21d279cc4f9fb8b3d6eb3..0d26f07883edae23674362925d7714b5a39ab51e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_dynamic_deadpool_noavb.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts b/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts
index 1c027ee5c4147988f4491e939a85607a3dbe5566..1d25547cbc1be139caa85d0ede776d5a5d8c6488 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_dynamic_deadpool_noavb.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {