powerpc: set CONFIG_PPC_OF=y always for ARCH=powerpc

The CONFIG_PPC_OF symbol is used to mean that the firmware device tree
access functions are available. Since we always have a device tree
with ARCH=powerpc, make CONFIG_PPC_OF always Y for ARCH=powerpc.

This fixes some compile errors reported by Kumar Gala, but in a
different way to his patch. This also makes prom_parse.o be compiled
only if CONFIG_PPC_OF so that non-OF ARCH=ppc platforms will compile.

Signed-off-by: Paul Mackerras <paulus@samba.org>

+5 -7
+1 -4
arch/powerpc/Kconfig
··· 329 329 select MMIO_NVRAM 330 330 331 331 config PPC_OF 332 - bool 333 - depends on PPC_MULTIPLATFORM # for now 334 - default y 332 + def_bool y 335 333 336 334 config XICS 337 335 depends on PPC_PSERIES ··· 397 399 config IBMEBUS 398 400 depends on PPC_PSERIES 399 401 bool "Support for GX bus based adapters" 400 - default y 401 402 help 402 403 Bus device driver for GX bus based adapters. 403 404
+2 -3
arch/powerpc/kernel/Makefile
··· 12 12 endif 13 13 14 14 obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ 15 - irq.o align.o signal_32.o pmc.o vdso.o \ 16 - prom_parse.o 15 + irq.o align.o signal_32.o pmc.o vdso.o 17 16 obj-y += vdso32/ 18 17 obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ 19 18 signal_64.o ptrace32.o systbl.o \ ··· 21 22 obj-$(CONFIG_PPC64) += vdso64/ 22 23 obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o 23 24 obj-$(CONFIG_POWER4) += idle_power4.o 24 - obj-$(CONFIG_PPC_OF) += of_device.o 25 + obj-$(CONFIG_PPC_OF) += of_device.o prom_parse.o 25 26 procfs-$(CONFIG_PPC64) := proc_ppc64.o 26 27 obj-$(CONFIG_PROC_FS) += $(procfs-y) 27 28 rtaspci-$(CONFIG_PPC64) := rtas_pci.o
+2
arch/powerpc/kernel/head_32.S
··· 120 120 * because OF may have I/O devices mapped into that area 121 121 * (particularly on CHRP). 122 122 */ 123 + #ifdef CONFIG_PPC_MULTIPLATFORM 123 124 cmpwi 0,r5,0 124 125 beq 1f 125 126 bl prom_init 126 127 trap 128 + #endif 127 129 128 130 /* 129 131 * Check for BootX signature when supporting PowerMac and branch to