aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-30 03:24:15 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-01 04:52:26 -0400
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 7f891ebfbd85..34be3247fca4 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -317,7 +317,7 @@ config PPC_BPA
317 317
318config PPC_OF 318config PPC_OF
319 bool 319 bool
320 depends on PPC_MULTIPLATFORM # for now 320 depends on PPC_MULTIPLATFORM || PPC_ISERIES
321 default y 321 default y
322 322
323config XICS 323config XICS
@@ -836,7 +836,7 @@ endmenu
836if PPC64 836if PPC64
837config KERNEL_START 837config KERNEL_START
838 hex 838 hex
839 default "0xc0000000" 839 default "0xc000000000000000"
840endif 840endif
841 841
842source "net/Kconfig" 842source "net/Kconfig"
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 61653cb60c4e..19df881bf67b 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -55,7 +55,7 @@ config BDI_SWITCH
55 55
56config BOOTX_TEXT 56config BOOTX_TEXT
57 bool "Support for early boot text console (BootX or OpenFirmware only)" 57 bool "Support for early boot text console (BootX or OpenFirmware only)"
58 depends PPC_OF 58 depends PPC_OF && !PPC_ISERIES
59 help 59 help
60 Say Y here to see progress messages from the boot firmware in text 60 Say Y here to see progress messages from the boot firmware in text
61 mode. Requires either BootX or Open Firmware. 61 mode. Requires either BootX or Open Firmware.