arm64: dts: rockchip: remove androidboot bootargs for px30/rk3399 boards

Change-Id: I7a04b215fba6d6967bb241f1d07f0199612ccc9c
Signed-off-by: Wu Liangqing <[email protected]>

Author: Wu Liangqing

arch/arm64/boot/dts/rockchip/px30-android.dtsi

@@ -6,7 +6,7 @@
 
 / {
 	chosen: chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init kpti=0";
+		bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 init=/init kpti=0";
 	};
 
 	fiq-debugger {

arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts

@@ -14,10 +14,6 @@
 	compatible = "rockchip,px30-evb-ddr4-v10", "rockchip,px30";
 };
 
-&chosen {
-	bootargs_ext = "androidboot.boot_devices=ff390000.dwmmc,ff3b0000.nandc";
-};
-
 &dsi {
 	status = "okay";
 

arch/arm64/boot/dts/rockchip/px30-mini-evb-ddr3-v11-avb.dts

@@ -14,10 +14,6 @@
 	compatible = "rockchip,px30-mini-evb-ddr3-v11-avb", "rockchip,px30";
 };
 
-&chosen {
-	bootargs_ext = "androidboot.boot_devices=ff390000.dwmmc,ff3b0000.nandc";
-};
-
 &dsi {
 	status = "okay";
 

arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-android-avb.dts

@@ -12,7 +12,7 @@
 	model = "Rockchip RK3399 EVB IND LPDDR4 Board edp (Android)";
 	compatible = "rockchip,android", "rockchip,rk3399-evb-ind-lpddr4-android", "rockchip,rk3399";
 	chosen: chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
+		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
 	};
 
 	iram: sram@ff8d0000 {

arch/arm64/boot/dts/rockchip/rk3399-evb-ind-lpddr4-v13-android-avb.dts

@@ -12,7 +12,7 @@
 	model = "Rockchip RK3399 EVB IND LPDDR4 Board edp (Android)";
 	compatible = "rockchip,android", "rockchip,rk3399-evb-ind-v13-lpddr4-android", "rockchip,rk3399";
 	chosen: chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
+		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
 	};
 
 	iram: sram@ff8d0000 {

arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts

@@ -17,7 +17,7 @@
 / {
 	compatible = "rockchip,rk3399-mid", "rockchip,rk3399";
 	chosen: chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
+		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
 	};
 
 	adc_keys {