ChangeSet 1.2236, 2005/04/03 20:03:53-07:00, [EMAIL PROTECTED]
Merge bk://linux-sam.bkbits.net/kconfig
into ppc970.osdl.org:/home/torvalds/v2.6/linux
ppc/Kconfig | 27 ++++++++++++++++-----------
sparc64/Kconfig | 29 +++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 11 deletions(-)
diff -Nru a/arch/ppc/Kconfig b/arch/ppc/Kconfig
--- a/arch/ppc/Kconfig 2005-04-03 21:26:41 -07:00
+++ b/arch/ppc/Kconfig 2005-04-03 21:26:41 -07:00
@@ -534,6 +534,17 @@
config SPRUCE
bool "IBM-Spruce"
+config HDPU
+ bool "Sky-HDPU"
+ help
+ Select HDPU if configuring a Sky Computers Compute Blade.
+
+config HDPU_FEATURES
+ depends HDPU
+ tristate "HDPU-Features"
+ help
+ Select to enable HDPU enhanced features.
+
config EV64260
bool "Marvell-EV64260BP"
help
@@ -566,7 +577,6 @@
config RADSTONE_PPC7D
bool "Radstone Technology PPC7D board"
- select MV64360
config ADIR
bool "SBS-Adirondack"
@@ -729,7 +739,7 @@
depends on SANDPOINT || MCPN765 || SPRUCE || PPLUS || PCORE || \
PRPMC750 || K2 || PRPMC800 || LOPEC || \
(EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \
- MPC834x_SYS
+ 83xx
default y
config FORCE
@@ -742,16 +752,11 @@
depends on EV64260 || CPCI690
default y
-config MV64360
+config MV64360 # Really MV64360 & MV64460
bool
- depends on KATANA || RADSTONE_PPC7D
+ depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU
default y
-config MV64360
- bool
- depends on CHESTNUT
- default y
-
config MV64X60
bool
depends on (GT64260 || MV64360)
@@ -807,7 +812,7 @@
config FSL_OCP
bool
- depends on MPC10X_BRIDGE || PPC_MPC52xx
+ depends on MPC10X_BRIDGE
default y
config MPC10X_OPENPIC
@@ -1095,7 +1100,7 @@
bool
config PCI
- bool "PCI support" if 40x || CPM2 || 83xx || 85xx
+ bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx
default y if !40x && !CPM2 && !8xx && !APUS && !83xx && !85xx
default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
default PCI_QSPAN if !4xx && !CPM2 && 8xx
diff -Nru a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
--- a/arch/sparc64/Kconfig 2005-04-03 21:26:41 -07:00
+++ b/arch/sparc64/Kconfig 2005-04-03 21:26:41 -07:00
@@ -16,6 +16,33 @@
bool
default y
+choice
+ prompt "Kernel page size"
+ default SPARC64_PAGE_SIZE_8KB
+
+config SPARC64_PAGE_SIZE_8KB
+ bool "8KB"
+ help
+ This lets you select the page size of the kernel.
+
+ 8KB and 64KB work quite well, since Sparc ELF sections
+ provide for up to 64KB alignment.
+
+ Therefore, 512KB and 4MB are for expert hackers only.
+
+ If you don't know what to do, choose 8KB.
+
+config SPARC64_PAGE_SIZE_64KB
+ bool "64KB"
+
+config SPARC64_PAGE_SIZE_512KB
+ bool "512KB"
+
+config SPARC64_PAGE_SIZE_4MB
+ bool "4MB"
+
+endchoice
+
source "init/Kconfig"
config SYSVIPC_COMPAT
@@ -190,9 +217,11 @@
bool "4MB"
config HUGETLB_PAGE_SIZE_512K
+ depends on !SPARC64_PAGE_SIZE_4MB
bool "512K"
config HUGETLB_PAGE_SIZE_64K
+ depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512K
bool "64K"
endchoice
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
