[PATCH] MIPS: OCTEON: Remove special case for simulator command line.

[PATCH] MIPS: OCTEON: Remove special case for simulator command line.

[David Daney]

From: David Daney <david.daney@cavium.com>

There is no reason to have the kernel to append commands when running
under the simulator, the simulator is perfectly capable of supplying
the necessary command line arguments.  Furthermore, if the simulator
needs something different than what is hard coded in the kernel, it
cannot get it if the kernel overrides it.

Fix/Simplify the whole thing by removing this bit.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 arch/mips/cavium-octeon/setup.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 38f4c32..5ebdb32 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -806,15 +806,6 @@ void __init prom_init(void)
 #endif
 	}
 
-	if (octeon_is_simulation()) {
-		/*
-		 * The simulator uses a mtdram device pre filled with
-		 * the filesystem. Also specify the calibration delay
-		 * to avoid calculating it every time.
-		 */
-		strcat(arcs_cmdline, " rw root=1f00 slram=root,0x40000000,+1073741824");
-	}
-
 	mips_hpt_frequency = octeon_get_clock_rate();
 
 	octeon_init_cvmcount();
-- 
1.7.11.7

Re: [PATCH] MIPS: OCTEON: Remove special case for simulator command line.

[Ralf Baechle]

On Mon, Oct 20, 2014 at 03:44:24PM -0700, David Daney wrote:

> From: David Daney <david.daney@cavium.com>
> 
> There is no reason to have the kernel to append commands when running
> under the simulator, the simulator is perfectly capable of supplying
> the necessary command line arguments.  Furthermore, if the simulator
> needs something different than what is hard coded in the kernel, it
> cannot get it if the kernel overrides it.
> 
> Fix/Simplify the whole thing by removing this bit.

And various other platforms have the same issue, usually due to the lack
of a mechanism to pass a command line.  I can see why this may be
necessary as a stop gap - but it's still a horrible, horrible solution.

Applied,

  Ralf