Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: David 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: Ralf Baechle <ralf@linux-mips.org>

authored by

David Daney and committed by
Ralf Baechle
dfa32261 a81507c7

+1 -24
-9
arch/mips/cavium-octeon/Kconfig
··· 25 25 26 26 if CAVIUM_OCTEON_SOC 27 27 28 - config CAVIUM_OCTEON_2ND_KERNEL 29 - bool "Build the kernel to be used as a 2nd kernel on the same chip" 30 - default "n" 31 - help 32 - This option configures this kernel to be linked at a different 33 - address and use the 2nd uart for output. This allows a kernel built 34 - with this option to be run at the same time as one built without this 35 - option. 36 - 37 28 config CAVIUM_OCTEON_LOCK_L2 38 29 bool "Lock often used kernel code in the L2" 39 30 default "y"
-4
arch/mips/cavium-octeon/Platform
··· 4 4 platform-$(CONFIG_CAVIUM_OCTEON_SOC) += cavium-octeon/ 5 5 cflags-$(CONFIG_CAVIUM_OCTEON_SOC) += \ 6 6 -I$(srctree)/arch/mips/include/asm/mach-cavium-octeon 7 - ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL 8 - load-$(CONFIG_CAVIUM_OCTEON_SOC) += 0xffffffff84100000 9 - else 10 7 load-$(CONFIG_CAVIUM_OCTEON_SOC) += 0xffffffff81100000 11 - endif
+1 -11
arch/mips/cavium-octeon/setup.c
··· 374 374 */ 375 375 int octeon_get_boot_uart(void) 376 376 { 377 - int uart; 378 - #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL 379 - uart = 1; 380 - #else 381 - uart = (octeon_boot_desc_ptr->flags & OCTEON_BL_FLAG_CONSOLE_UART1) ? 377 + return (octeon_boot_desc_ptr->flags & OCTEON_BL_FLAG_CONSOLE_UART1) ? 382 378 1 : 0; 383 - #endif 384 - return uart; 385 379 } 386 380 387 381 /** ··· 895 901 } 896 902 897 903 if (strstr(arcs_cmdline, "console=") == NULL) { 898 - #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL 899 - strcat(arcs_cmdline, " console=ttyS0,115200"); 900 - #else 901 904 if (octeon_uart == 1) 902 905 strcat(arcs_cmdline, " console=ttyS1,115200"); 903 906 else 904 907 strcat(arcs_cmdline, " console=ttyS0,115200"); 905 - #endif 906 908 } 907 909 908 910 mips_hpt_frequency = octeon_get_clock_rate();