leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: set CONFIG_PPC_OF=y always for ARCH=powerpc

Browse Source 
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>
This commit is contained in:
Paul Mackerras 2006-01-09 20:17:01 +11:00
parent bce6c5fd8c
commit 0a498d96a3
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/Kconfig
View File

@ -329,9 +329,7 @@ config PPC_CELL
select MMIO_NVRAM select MMIO_NVRAM
config PPC_OF config PPC_OF
bool def_bool y
depends on PPC_MULTIPLATFORM # for now
default y
config XICS config XICS
depends on PPC_PSERIES depends on PPC_PSERIES
@ -399,7 +397,6 @@ config IBMVIO
config IBMEBUS config IBMEBUS
depends on PPC_PSERIES depends on PPC_PSERIES
bool "Support for GX bus based adapters" bool "Support for GX bus based adapters"
default y
help help
Bus device driver for GX bus based adapters. Bus device driver for GX bus based adapters.

5
arch/powerpc/kernel/Makefile
View File

@ -12,8 +12,7 @@ CFLAGS_btext.o += -fPIC
endif endif
obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ obj-y := semaphore.o cputable.o ptrace.o syscalls.o \
irq.o align.o signal_32.o pmc.o vdso.o \ irq.o align.o signal_32.o pmc.o vdso.o
prom_parse.o
obj-y += vdso32/ obj-y += vdso32/
obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \
signal_64.o ptrace32.o systbl.o \ signal_64.o ptrace32.o systbl.o \
@ -22,7 +21,7 @@ obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \
obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_PPC64) += vdso64/
obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
obj-$(CONFIG_POWER4) += idle_power4.o obj-$(CONFIG_POWER4) += idle_power4.o
obj-$(CONFIG_PPC_OF) += of_device.o obj-$(CONFIG_PPC_OF) += of_device.o prom_parse.o
procfs-$(CONFIG_PPC64) := proc_ppc64.o procfs-$(CONFIG_PPC64) := proc_ppc64.o
obj-$(CONFIG_PROC_FS) += $(procfs-y) obj-$(CONFIG_PROC_FS) += $(procfs-y)
rtaspci-$(CONFIG_PPC64) := rtas_pci.o rtaspci-$(CONFIG_PPC64) := rtas_pci.o

2
arch/powerpc/kernel/head_32.S
View File

@ -120,10 +120,12 @@ __start:
* because OF may have I/O devices mapped into that area * because OF may have I/O devices mapped into that area
* (particularly on CHRP). * (particularly on CHRP).
*/ */
#ifdef CONFIG_PPC_MULTIPLATFORM
cmpwi 0,r5,0 cmpwi 0,r5,0
beq 1f beq 1f
bl prom_init bl prom_init
trap trap
#endif
/* /*
* Check for BootX signature when supporting PowerMac and branch to * Check for BootX signature when supporting PowerMac and branch to