arm/dt: tegra: Remove /chosen node

The command-lines present in the existing /chosen node are not necessarily
correct for all users. Ideally, we should simply use the command-line
supplied by the boot-loader.

In fact, using the boot-loader's cmdline is quite easy; either the
bootloader fully supports DT, in which case it can modify the DT passed
to the kernel to include its command-line, or CONFIG_APPENDED_DTB can
be used in conjunction with CONFIG_ARM_ATAG_DTB_COMPAT, and the kernel
will substitute the bootloader's command-line into the DT.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index a80232443b7f39e16feaa1f92f0db7a662e2d05d..ca6fa1084c9dd69012babfcdd2b7c85a0c8aa10b 100644 (file)
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -6,10 +6,6 @@
        model = "NVIDIA Tegra2 Harmony evaluation board";
        compatible = "nvidia,harmony", "nvidia,tegra20";
 
-       chosen {
-               bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait";
-       };
-
        memory@0 {
                reg = < 0x00000000 0x40000000 >;
        };

diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 1cd0cfe9e3d023e9737ee2f5bd7770620710a9e2..4f6a8aa0a757f7716df4683d9f2a0758331b516e 100644 (file)
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -6,10 +6,6 @@
        model = "Toshiba AC100 / Dynabook AZ";
        compatible = "compal,paz00", "nvidia,tegra20";
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8 root=/dev/mmcblk0p1";
-       };
-
        memory@0 {
                reg = <0x00000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 60724e4183b475321d7d4e6a3873d14d986e2c3f..d1ada26b7b90265ded64dbd5105a82c7e5ec9295 100644 (file)
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -6,10 +6,6 @@
        model = "NVIDIA Seaboard";
        compatible = "nvidia,seaboard", "nvidia,tegra20";
 
-       chosen {
-               bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";
-       };
-
        memory {
                device_type = "memory";
                reg = < 0x00000000 0x40000000 >;

diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 95117d31fee3d11c95e02a2c7e353eabd8bfccae..cf8e5617f3bd7469430552e204837aa03ac27455 100644 (file)
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -6,10 +6,6 @@
        model = "Compulab TrimSlice board";
        compatible = "compulab,trimslice", "nvidia,tegra20";
 
-       chosen {
-               bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p1 rw rootwait";
-       };
-
        memory@0 {
                reg = < 0x00000000 0x40000000 >;
        };

diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 2af12fa76eef3f275175be5b0dae7523d37ced6c..1c0948541806a4deb33c9ed0d84da1285772bd0d 100644 (file)
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -6,10 +6,6 @@
        model = "NVIDIA Tegra2 Ventana evaluation board";
        compatible = "nvidia,ventana", "nvidia,tegra20";
 
-       chosen {
-               bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";
-       };
-
        memory {
                reg = < 0x00000000 0x40000000 >;
        };