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

Commit 05f94eeb authored by Imre Kaloz's avatar Imre Kaloz Committed by Ralf Baechle
Browse files

MIPS: Sibyte: Remove standalone kernel support 



CFE is the only supported and used bootloader on the SiByte boards,
the standalone kernel support has been never used outside Broadcom.
Remove it and make the kernel use CFE by default.

Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 435f81f4

arch/mips/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ libs-$(CONFIG_ARC) += arch/mips/fw/arc/ 
libs-$(CONFIG_CFE)		+= arch/mips/fw/cfe/

libs-$(CONFIG_SNIPROM)		+= arch/mips/fw/sni/

libs-y				+= arch/mips/fw/lib/

libs-$(CONFIG_SIBYTE_CFE)	+= arch/mips/sibyte/cfe/



#

# Board-dependent options and extra files

arch/mips/sibyte/Kconfig

+3 −21
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ config SIBYTE_SB1xxx_SOC 
	select SWAP_IO_SPACE

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select CFE

	select SYS_HAS_EARLY_PRINTK



choice

	prompt "SiByte SOC Stepping"
@@ -136,34 +138,14 @@ config SB1_CERR_STALL 
	bool "Stall (rather than panic) on fatal cache error"

	depends on SIBYTE_SB1xxx_SOC



config SIBYTE_CFE

	bool "Booting from CFE"

	depends on SIBYTE_SB1xxx_SOC

	select CFE

	select SYS_HAS_EARLY_PRINTK

	help

	  Make use of the CFE API for enumerating available memory,

	  controlling secondary CPUs, and possibly console output.



config SIBYTE_CFE_CONSOLE

	bool "Use firmware console"

	depends on SIBYTE_CFE

	depends on SIBYTE_SB1xxx_SOC

	help

	  Use the CFE API's console write routines during boot.  Other console

	  options (VT console, sb1250 duart console, etc.) should not be

	  configured.



config SIBYTE_STANDALONE

	bool

	depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE

	select SYS_HAS_EARLY_PRINTK

	default y



config SIBYTE_STANDALONE_RAM_SIZE

	int "Memory size (in megabytes)"

	depends on SIBYTE_STANDALONE

	default "32"



config SIBYTE_BUS_WATCHER

	bool "Support for Bus Watcher statistics"

	depends on SIBYTE_SB1xxx_SOC

arch/mips/sibyte/cfe/Makefile

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
lib-y					= setup.o

lib-$(CONFIG_SIBYTE_CFE_CONSOLE)	+= console.o

arch/mips/sibyte/common/Makefile

+2 −2
Original line number Diff line number Diff line 
obj-y :=



obj-y := cfe.o

obj-$(CONFIG_SIBYTE_CFE_CONSOLE)	+= cfe_console.o

obj-$(CONFIG_SIBYTE_TBPROF)		+= sb_tbprof.o



EXTRA_CFLAGS += -Werror