diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-03 06:08:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 12:17:20 -0500 |
commit | d670bd4f803c8b646acd20f3ba21e65458293faf (patch) | |
tree | eabc30aadce1556023c4aa445c649ba9e1d3f352 /arch/sparc/Kconfig | |
parent | 478b8fecda511942404ac232897a718cecd13e48 (diff) |
sparc: prepare kernel/ for unification
o sparc32 files with identical names to sparc64 renamed to <name>_32.S
o introduced a few Kconfig helpers to simplify Makefile logic
o refactored Makefile to prepare for unification
- use obj-$(CONFIG_SPARC32) for sparc32 specific files
- use <name>_$(BITS) for files where sparc64 has a _64 variant
- sparc64 directly include a few files where sparc32 builds them,
refer to these files directly (no BITS)
- sneaked in -Werror as used by sparc64
o modified sparc/Makefile to use the new names for head/init_task
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r-- | arch/sparc/Kconfig | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 26ddeedb5166..7cfe557db23d 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -198,6 +198,17 @@ config EMULATED_CMPXCHG | |||
198 | Sparc32 does not have a CAS instruction like sparc64. cmpxchg() | 198 | Sparc32 does not have a CAS instruction like sparc64. cmpxchg() |
199 | is emulated, and therefore it is not completely atomic. | 199 | is emulated, and therefore it is not completely atomic. |
200 | 200 | ||
201 | # Makefile helpers | ||
202 | config SPARC32_SMP | ||
203 | bool | ||
204 | default y | ||
205 | depends on SPARC32 && SMP | ||
206 | |||
207 | config SPARC64_SMP | ||
208 | bool | ||
209 | default y | ||
210 | depends on SPARC64 && SMP | ||
211 | |||
201 | choice | 212 | choice |
202 | prompt "Kernel page size" if SPARC64 | 213 | prompt "Kernel page size" if SPARC64 |
203 | default SPARC64_PAGE_SIZE_8KB | 214 | default SPARC64_PAGE_SIZE_8KB |
@@ -505,6 +516,16 @@ config SUN_OPENPROMFS | |||
505 | Only choose N if you know in advance that you will not need to modify | 516 | Only choose N if you know in advance that you will not need to modify |
506 | OpenPROM settings on the running system. | 517 | OpenPROM settings on the running system. |
507 | 518 | ||
519 | # Makefile helpers | ||
520 | config SPARC32_PCI | ||
521 | bool | ||
522 | default y | ||
523 | depends on SPARC32 && PCI | ||
524 | |||
525 | config SPARC64_PCI | ||
526 | bool | ||
527 | default y | ||
528 | depends on SPARC64 && PCI | ||
508 | 529 | ||
509 | endmenu | 530 | endmenu |
510 | 531 | ||