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>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 7f891ebfbd85e97db7bbd422b0239bcf2ab62316..34be3247fca48f64320d69829f7d999c9bca3cf1 100644 (file)
--- 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 61653cb60c4e3f01f294f0dd04301446d5049a1d..19df881bf67bf2c8b826552a65cf4df7661d58b0 100644 (file)
--- 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.