aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-30 17:24:15 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-01 18:52:26 +1000
commiteeb2d21806123a67d957783c4a0c8b020a378cf0 (patch)
treee19cc71b40592efa308018c42691dcdec4850f65 /arch
parentcabb558714945e92000f627dda562aa5e86a31af (diff)
powerpc: make iSeries boot
Now that we use the device tree, it helps to build it in. It helps to links the kernel at the correct address. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--arch/powerpc/Kconfig.debug2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 7f891ebfbd8..34be3247fca 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -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
@@ -836,7 +836,7 @@ endmenu
if PPC64
config KERNEL_START
hex
- default "0xc0000000"
+ default "0xc000000000000000"
endif
source "net/Kconfig"
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 61653cb60c4..19df881bf67 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -55,7 +55,7 @@ config BDI_SWITCH
config BOOTX_TEXT
bool "Support for early boot text console (BootX or OpenFirmware only)"
- depends PPC_OF
+ depends PPC_OF && !PPC_ISERIES
help
Say Y here to see progress messages from the boot firmware in text
mode. Requires either BootX or Open Firmware.