Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa32261 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Octeon: Remove vestiges of CONFIG_CAVIUM_OCTEON_2ND_KERNEL 



This config option never really worked, and has bit-rotted to the
point of being completely useless.  Remove it completely.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Steven J. Hill <steven.hill@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15314/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent a81507c7

arch/mips/cavium-octeon/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -25,15 +25,6 @@ endif # CPU_CAVIUM_OCTEON 


if CAVIUM_OCTEON_SOC



config CAVIUM_OCTEON_2ND_KERNEL

	bool "Build the kernel to be used as a 2nd kernel on the same chip"

	default "n"

	help

	  This option configures this kernel to be linked at a different

	  address and use the 2nd uart for output. This allows a kernel built

	  with this option to be run at the same time as one built without this

	  option.



config CAVIUM_OCTEON_LOCK_L2

	bool "Lock often used kernel code in the L2"

	default "y"

arch/mips/cavium-octeon/Platform

+0 −4
Original line number Diff line number Diff line
@@ -4,8 +4,4 @@ 
platform-$(CONFIG_CAVIUM_OCTEON_SOC)	+= cavium-octeon/

cflags-$(CONFIG_CAVIUM_OCTEON_SOC)	+=				\

		-I$(srctree)/arch/mips/include/asm/mach-cavium-octeon

ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL

load-$(CONFIG_CAVIUM_OCTEON_SOC)	+= 0xffffffff84100000

else

load-$(CONFIG_CAVIUM_OCTEON_SOC)	+= 0xffffffff81100000
 
endif

arch/mips/cavium-octeon/setup.c

+1 −11
Original line number Diff line number Diff line
@@ -374,14 +374,8 @@ void octeon_write_lcd(const char *s) 
 */

int octeon_get_boot_uart(void)

{

	int uart;

#ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL

	uart = 1;

#else

	uart = (octeon_boot_desc_ptr->flags & OCTEON_BL_FLAG_CONSOLE_UART1) ?

	return (octeon_boot_desc_ptr->flags & OCTEON_BL_FLAG_CONSOLE_UART1) ?

		1 : 0;

#endif

	return uart;

}



/**
@@ -901,14 +895,10 @@ void __init prom_init(void) 
	}



	if (strstr(arcs_cmdline, "console=") == NULL) {

#ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL

		strcat(arcs_cmdline, " console=ttyS0,115200");

#else

		if (octeon_uart == 1)

			strcat(arcs_cmdline, " console=ttyS1,115200");

		else

			strcat(arcs_cmdline, " console=ttyS0,115200");

#endif

	}



	mips_hpt_frequency = octeon_get_clock_rate();