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

Commit 60a762b6 authored by Greg Edwards's avatar Greg Edwards Committed by Tony Luck
Browse files

[IA64] remove CONFIG_IA64_SGI_SN_SIM 



This patch removes the CONFIG_IA64_SGI_SN_SIM option entirely, allowing
any kernel bootable on sn2 to also be booted in the simulator.

Boot tested on Altix and HP rx2600.

Signed-off-by: default avatarGreg Edwards <edwardsg@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 514604c6

arch/ia64/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -220,13 +220,6 @@ config IOSAPIC 
	depends on !IA64_HP_SIM

	default y



config IA64_SGI_SN_SIM

	bool "SGI Medusa Simulator Support"

	depends on IA64_SGI_SN2 || IA64_GENERIC

	help

	  If you are compiling a kernel that will run under SGI's IA-64

	  simulator (Medusa) then say Y, otherwise say N.



config IA64_SGI_SN_XP

	tristate "Support communication between SGI SSIs"

	select IA64_UNCACHED_ALLOCATOR

arch/ia64/configs/sn2_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ CONFIG_HOLES_IN_ZONE=y 
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

# CONFIG_IA64_CYCLONE is not set

CONFIG_IOSAPIC=y

CONFIG_IA64_SGI_SN_SIM=y

CONFIG_FORCE_MAX_ZONEORDER=18

CONFIG_SMP=y

CONFIG_NR_CPUS=512

include/asm-ia64/sn/simulator.h

+1 −8
Original line number Diff line number Diff line
@@ -13,16 +13,9 @@ 
#define SNMAGIC 0xaeeeeeee8badbeefL

#define IS_MEDUSA()			({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;})



#ifdef CONFIG_IA64_SGI_SN_SIM

#define SIMULATOR_SLEEP()		asm("nop.i 0x8beef")

#define IS_RUNNING_ON_SIMULATOR()	(sn_prom_type)

#define IS_RUNNING_ON_FAKE_PROM()	(sn_prom_type == 2)

extern int sn_prom_type;		/* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */

#else

#define IS_RUNNING_ON_SIMULATOR()	(0)

#define IS_RUNNING_ON_FAKE_PROM()	(0)

#define SIMULATOR_SLEEP()



#endif



#endif /* _ASM_IA64_SN_SIMULATOR_H */