Commit dca50f08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2_fixes_for_v5.15_part1' of... 

Merge tag 'nios2_fixes_for_v5.15_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

Pull nios2 fixes from Dinh Nguyen:

 - Fix build warning for unmet dependency for EARLY_PRINTK

 - Remove unused dram_start() function

* tag 'nios2_fixes_for_v5.15_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  NIOS2: setup.c: drop unused variable 'dram_start'
  NIOS2: fix kconfig unmet dependency warning for SERIAL_CORE_CONSOLE
parents 6fd3ec5c 9523b33c

arch/nios2/Kconfig.debug

+2 −1
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ 
config EARLY_PRINTK

	bool "Activate early kernel debugging"

	default y

	depends on TTY

	select SERIAL_CORE_CONSOLE

	help

	  Enable early printk on console

	  Enable early printk on console.

	  This is useful for kernel debugging when your machine crashes very

	  early before the console code is initialized.

	  You should normally say N here, unless you want to debug such a crash.

arch/nios2/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ static void __init find_limits(unsigned long *min, unsigned long *max_low, 


void __init setup_arch(char **cmdline_p)

{

	int dram_start;



	console_verbose();



	memory_start = memblock_start_of_DRAM();