From 982b95da1d378640d7583a00c4bf839afbb25642 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 22 Oct 2023 23:09:19 +0100 Subject: [PATCH] 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 --- .../boot/dts/amlogic/firmware_deadpool.dtsi | 59 --------- .../boot/dts/amlogic/g12a_s905y2_radxa0.dts | 2 +- .../dts/amlogic/g12a_s905y2_radxa0_4g.dts | 2 +- ...partition_mbox_dynamic_deadpool_noavb.dtsi | 112 ------------------ .../dts/amlogic/sm1_s905y3_bananapim5.dts | 2 +- .../boot/dts/amlogic/sm1_s905y3_odroidc4.dts | 2 +- 6 files changed, 4 insertions(+), 175 deletions(-) delete mode 100644 arch/arm64/boot/dts/amlogic/firmware_deadpool.dtsi delete mode 100644 arch/arm64/boot/dts/amlogic/partition_mbox_dynamic_deadpool_noavb.dtsi diff --git a/arch/arm64/boot/dts/amlogic/firmware_deadpool.dtsi b/arch/arm64/boot/dts/amlogic/firmware_deadpool.dtsi deleted file mode 100644 index 6f741bb5bff0..000000000000 --- 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 38dc8170c235..96a7ce928c57 100644 --- 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 0ff81ab292c6..5874f266ea7c 100644 --- 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 index bef370154b71..000000000000 --- 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 = <¶m>; - 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 bd948ba5c3f3..0d26f07883ed 100644 --- 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 1c027ee5c414..1d25547cbc1b 100644 --- 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" / { -- 2.20.1