From dbd67b026d6185b6f5277c4b5889be7b22de7f86 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Thu, 3 Aug 2023 07:49:06 +0000 Subject: [PATCH] tegra234: Move boot argument from base to overlay The property "bootargs" is not available in base file available in mainline. Hence, move this to overlay file. Bug 4037899 Change-Id: I3065495c1d7e3e6f67f456fe0359c355cb024aff Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2947548 (cherry picked from commit 377744a85450d7e24c84fdd147028cacf7202d5e) Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2955885 GVS: Gerrit_Virtual_Submit --- overlay/tegra234-p3737-0000+p3701-0000.dts | 4 ++++ overlay/tegra234-p3740-0002+p3701-0008.dts | 4 ++++ tegra234-p3737-0000+p3701-0000.dts | 1 - tegra234-p3740-0002+p3701-0008.dts | 1 - 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/overlay/tegra234-p3737-0000+p3701-0000.dts b/overlay/tegra234-p3737-0000+p3701-0000.dts index 9880409..cc56a8e 100644 --- a/overlay/tegra234-p3737-0000+p3701-0000.dts +++ b/overlay/tegra234-p3737-0000+p3701-0000.dts @@ -21,6 +21,10 @@ fragment-t234-p3737-p3701@0 { target-path = "/"; __overlay__ { + chosen { + bootargs = "console=ttyTCU0,115200n8"; + }; + cpus { idle-states { c7 { diff --git a/overlay/tegra234-p3740-0002+p3701-0008.dts b/overlay/tegra234-p3740-0002+p3701-0008.dts index 88bf811..4698b20 100644 --- a/overlay/tegra234-p3740-0002+p3701-0008.dts +++ b/overlay/tegra234-p3740-0002+p3701-0008.dts @@ -19,6 +19,10 @@ fragment-t234-p3740-p3701@0 { target-path = "/"; __overlay__ { + chosen { + bootargs = "console=ttyTCU0,115200n8"; + }; + bpmp { thermal { status = "okay"; diff --git a/tegra234-p3737-0000+p3701-0000.dts b/tegra234-p3737-0000+p3701-0000.dts index 1639f85..2a4cd1c 100644 --- a/tegra234-p3737-0000+p3701-0000.dts +++ b/tegra234-p3737-0000+p3701-0000.dts @@ -18,7 +18,6 @@ }; chosen { - bootargs = "console=ttyS0,115200n8"; stdout-path = "serial0:115200n8"; }; diff --git a/tegra234-p3740-0002+p3701-0008.dts b/tegra234-p3740-0002+p3701-0008.dts index ebed0f8..bac611d 100644 --- a/tegra234-p3740-0002+p3701-0008.dts +++ b/tegra234-p3740-0002+p3701-0008.dts @@ -16,7 +16,6 @@ }; chosen { - bootargs = "console=ttyTCU0,115200n8"; stdout-path = "serial0:115200n8"; };