tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Paul Mackerras 0a498d96 bce6c5fd

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