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

Commit 1b84e1c8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, VisWS: turn into generic arch, flip over VISWS to generic arch 



this is the big move: flip over VISWS to generic arch support.

From this commit on CONFIG_X86_VISWS is just another (default-disabled)
option that turns on certain quirks - no other complications.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 65253636

arch/x86/Kconfig

+13 −13
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ config SMP 


config X86_FIND_SMP_CONFIG

	def_bool y

	depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS

	depends on X86_MPPARSE || X86_VOYAGER



if ACPI

config X86_MPPARSE
@@ -281,18 +281,6 @@ config X86_VOYAGER 
	  If you do not specifically know you have a Voyager based machine,

	  say N here, otherwise the kernel you build will not be bootable.



config X86_VISWS

	bool "SGI 320/540 (Visual Workstation)"

	depends on X86_32 && PCI

	help

	  The SGI Visual Workstation series is an IA32-based workstation

	  based on SGI systems chips with some legacy PC hardware attached.



	  Say Y here to create a kernel to run on the SGI 320 or 540.



	  A kernel compiled for the Visual Workstation will not run on PCs

	  and vice versa. See <file:Documentation/sgi-visws.txt> for details.



config X86_GENERICARCH

       bool "Generic architecture"

	depends on X86_32
@@ -363,6 +351,18 @@ config X86_VSMP 


endchoice



config X86_VISWS

	bool "SGI 320/540 (Visual Workstation)"

	depends on X86_32 && PCI

	help

	  The SGI Visual Workstation series is an IA32-based workstation

	  based on SGI systems chips with some legacy PC hardware attached.



	  Say Y here to create a kernel to run on the SGI 320 or 540.



	  A kernel compiled for the Visual Workstation will run on general

	  PCs as well. See <file:Documentation/sgi-visws.txt> for details.



config SCHED_NO_NO_OMIT_FRAME_POINTER

	def_bool y

	prompt "Single-depth WCHAN output"

arch/x86/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-x86/mach-voyager 
mcore-$(CONFIG_X86_VOYAGER)	:= arch/x86/mach-voyager/



# VISWS subarch support

mflags-$(CONFIG_X86_VISWS)	:= -Iinclude/asm-x86/mach-visws

mcore-$(CONFIG_X86_VISWS)	:= arch/x86/mach-visws/

#mflags-$(CONFIG_X86_VISWS)	:= -Iinclude/asm-x86/mach-visws

#mcore-$(CONFIG_X86_VISWS)	:= arch/x86/mach-visws/



# generic subarchitecture

mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o 
obj-y			+= traps_$(BITS).o irq_$(BITS).o

obj-y			+= time_$(BITS).o ioport.o ldt.o

obj-y			+= setup.o i8259.o irqinit_$(BITS).o setup_percpu.o

obj-$(CONFIG_X86_VISWS)	+= setup_visws.o traps_visws.o apic_visws.o

obj-$(CONFIG_X86_32)	+= probe_roms_32.o

obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o

obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o