diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-30 03:24:15 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-01 04:52:26 -0400 |
commit | eeb2d21806123a67d957783c4a0c8b020a378cf0 (patch) | |
tree | e19cc71b40592efa308018c42691dcdec4850f65 | |
parent | cabb558714945e92000f627dda562aa5e86a31af (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>
-rw-r--r-- | arch/powerpc/Kconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/Kconfig.debug | 2 |
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 | ||
318 | config PPC_OF | 318 | config 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 | ||
323 | config XICS | 323 | config XICS |
@@ -836,7 +836,7 @@ endmenu | |||
836 | if PPC64 | 836 | if PPC64 |
837 | config KERNEL_START | 837 | config KERNEL_START |
838 | hex | 838 | hex |
839 | default "0xc0000000" | 839 | default "0xc000000000000000" |
840 | endif | 840 | endif |
841 | 841 | ||
842 | source "net/Kconfig" | 842 | source "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 | ||
56 | config BOOTX_TEXT | 56 | config 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. |