From e2bf2eaab8d824b97a115917c99a68d08305ae52 Mon Sep 17 00:00:00 2001 From: Wang Xiaobin Date: Mon, 10 Oct 2022 10:50:05 +0800 Subject: [PATCH] ARM: dts: rockchip: rv1103g-rmsl311: remove meta node and use erofs The layout about meta has been changed and defined in rv1106-thunder-boot.dtsi. Signed-off-by: Wang Xiaobin Change-Id: Ia05c9020dd52b5c6a0e9c94b1e7d799fd65d9d76 --- arch/arm/boot/dts/rv1103g-rmsl311-dloc-sl-v10.dts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/rv1103g-rmsl311-dloc-sl-v10.dts b/arch/arm/boot/dts/rv1103g-rmsl311-dloc-sl-v10.dts index 970f598e0596..1ef3a983b1c3 100644 --- a/arch/arm/boot/dts/rv1103g-rmsl311-dloc-sl-v10.dts +++ b/arch/arm/boot/dts/rv1103g-rmsl311-dloc-sl-v10.dts @@ -13,7 +13,7 @@ compatible = "rockchip,rv1103g-rmsl311-dloc-v10", "rockchip,rv1103"; chosen { - bootargs = "loglevel=0 console=ttyFIQ0 root=/dev/rd0 snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0 driver_async_probe=dwmmc_rockchip"; + bootargs = "loglevel=0 rootfstype=erofs rootflags=dax console=ttyFIQ0 root=/dev/rd0 snd_soc_core.prealloc_buffer_size_kbytes=16 coherent_pool=0 driver_async_probe=dwmmc_rockchip"; }; vcc_1v8: vcc-1v8 { @@ -132,11 +132,6 @@ reg = <0x00000000 0x04000000>; }; -&meta { - /* reserved meta partition 384KB */ - reg = <0x01e00000 (384 * 0x400)>; -}; - &mipi0_csi2 { status = "okay";