aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-02 11:12:43 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-02 11:12:43 +1000
commit292dcc86dd69e343630ab49ce96a418345c174fc (patch)
tree08d00ca3559e96bda3bda0cce92283364117b89b /arch/powerpc/Kconfig
parentc0c0d996d08e450164adedc249c1bbbca63524ce (diff)
parenteeb2d21806123a67d957783c4a0c8b020a378cf0 (diff)
Merge rsync://ozlabs.org/sfr-git/for-paulus/
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r--arch/powerpc/Kconfig12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index edfac467b9e..34be3247fca 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -142,8 +142,8 @@ config POWER4
def_bool y
config PPC_FPU
- bool
- default y if PPC64
+ depends on PPC32
+ def_bool y
config BOOKE
bool
@@ -317,7 +317,7 @@ config PPC_BPA
config PPC_OF
bool
- depends on PPC_MULTIPLATFORM # for now
+ depends on PPC_MULTIPLATFORM || PPC_ISERIES
default y
config XICS
@@ -833,6 +833,12 @@ config PIN_TLB
depends on ADVANCED_OPTIONS && 8xx
endmenu
+if PPC64
+config KERNEL_START
+ hex
+ default "0xc000000000000000"
+endif
+
source "net/Kconfig"
source "drivers/Kconfig"