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

Commit 0b57ee9e authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[SPARC]: introduce a SPARC Kconfig symbol 



Introduce a Kconfig symbol SPARC that is defined on both the sparc and
sparc64 architectures.

This symbol makes some dependencies more readable.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14904398

arch/sparc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ config NR_CPUS 
	depends on SMP

	default "32"



config SPARC

	bool

	default y



# Identify this as a Sparc32 build

config SPARC32

	bool

arch/sparc64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 


mainmenu "Linux/UltraSPARC Kernel Configuration"



config SPARC

	bool

	default y



config SPARC64

	bool

	default y

drivers/char/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ config NVRAM 


config RTC

	tristate "Enhanced Real Time Clock Support"

	depends on !PPC32 && !PARISC && !IA64 && !M68K && (!(SPARC32 || SPARC64) || PCI)

	depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || PCI)

	---help---

	  If you say Y here and create a character special file /dev/rtc with

	  major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -735,7 +735,7 @@ config SGI_IP27_RTC 


config GEN_RTC

	tristate "Generic /dev/rtc emulation"

	depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC32 && !SPARC64

	depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC

	---help---

	  If you say Y here and create a character special file /dev/rtc with

	  major number 10 and minor number 135 using mknod ("man mknod"), you

drivers/char/keyboard.c

+5 −5
Original line number Diff line number Diff line
@@ -930,8 +930,8 @@ static void kbd_refresh_leds(struct input_handle *handle) 
}



#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\

    defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) ||\

    defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\

    defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\

    defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\

    (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC))



#define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\
@@ -958,7 +958,7 @@ static unsigned short x86_keycodes[256] = 
extern int mac_hid_mouse_emulate_buttons(int, int, int);

#endif /* CONFIG_MAC_EMUMOUSEBTN */



#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)

#ifdef CONFIG_SPARC

static int sparc_l1_a_state = 0;

extern void sun_do_break(void);

#endif
@@ -1045,7 +1045,7 @@ static void kbd_keycode(unsigned int keycode, int down, 


	if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT)

		sysrq_alt = down;

#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)

#ifdef CONFIG_SPARC

	if (keycode == KEY_STOP)

		sparc_l1_a_state = down;

#endif
@@ -1072,7 +1072,7 @@ static void kbd_keycode(unsigned int keycode, int down, 
		return;

	}

#endif

#if defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)

#ifdef CONFIG_SPARC

	if (keycode == KEY_A && sparc_l1_a_state) {

		sparc_l1_a_state = 0;

		sun_do_break();

drivers/fc4/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ comment "FC4 drivers" 


config FC4_SOC

	tristate "Sun SOC/Sbus"

	depends on FC4!=n && (SPARC32 || SPARC64)

	depends on FC4!=n && SPARC

	help

	  Serial Optical Channel is an interface card with one or two Fibre

	  Optic ports, each of which can be connected to a disk array. Note
@@ -38,7 +38,7 @@ config FC4_SOC 


config FC4_SOCAL

	tristate "Sun SOC+ (aka SOCAL)"

	depends on FC4!=n && (SPARC32 || SPARC64)

	depends on FC4!=n && SPARC

	---help---

	  Serial Optical Channel Plus is an interface card with up to two

	  Fibre Optic ports. This card supports FC Arbitrated Loop (usually
@@ -62,7 +62,7 @@ config SCSI_PLUTO 
	  be called pluto.



config SCSI_FCAL

	tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC32 || SPARC64

	tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC

	depends on FC4!=n && SCSI

	help

	  This driver drives FC-AL disks connected through a Fibre Channel
@@ -75,7 +75,7 @@ config SCSI_FCAL 


config SCSI_FCAL

	prompt "Generic FC-AL disk driver"

	depends on FC4!=n && SCSI && !SPARC32 && !SPARC64

	depends on FC4!=n && SCSI && !SPARC



endmenu