summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 09:16:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 09:16:56 -0700
commit5a439c565799cb8d290d71ce375e86be64d43a4b (patch)
treeb7933dced01add02249af35f5497e77cd11dbfdf /arch/xtensa/Kconfig
parent94b6da5ab8293b04a300ba35c72eddfa94db8b02 (diff)
parent0025427eee4b5c005b4ac7a6489adc773e38611d (diff)
downloadtalos-obmc-linux-5a439c565799cb8d290d71ce375e86be64d43a4b.tar.gz
talos-obmc-linux-5a439c565799cb8d290d71ce375e86be64d43a4b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6: xtensa: Add config files for Diamond 232L - Rev B processor variant xtensa: Fix io regions xtensa: Add support for the Sonic Ethernet device for the XT2000 board. xtensa: replace remaining __FUNCTION__ occurrences xtensa: use newer __SPIN_LOCK_UNLOCKED macro XTENSA: warn about including <asm/rwsem.h> directly.
Diffstat (limited to 'arch/xtensa/Kconfig')
-rw-r--r--arch/xtensa/Kconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index a213260b51e5..6c873dceb177 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -64,7 +64,12 @@ choice
default XTENSA_VARIANT_FSF
config XTENSA_VARIANT_FSF
- bool "fsf"
+ bool "fsf - default (not generic) configuration"
+
+config XTENSA_VARIANT_DC232B
+ bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
+ help
+ This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).
endchoice
config MMU
OpenPOWER on IntegriCloud