|
|
|
|
#
|
|
|
|
|
# Makefile for the linux kernel.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
ifeq ($(CONFIG_PPC64),y)
|
|
|
|
|
EXTRA_CFLAGS += -mno-minimal-toc
|
|
|
|
|
CFLAGS_ioctl32.o += -Ifs/
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(CONFIG_PPC32),y)
|
|
|
|
|
CFLAGS_prom_init.o += -fPIC
|
|
|
|
|
CFLAGS_btext.o += -fPIC
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
obj-y := semaphore.o cputable.o ptrace.o syscalls.o \
|
|
|
|
|
irq.o align.o signal_32.o pmc.o vdso.o
|
|
|
|
|
obj-y += vdso32/
|
|
|
|
|
obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \
|
|
|
|
|
signal_64.o ptrace32.o systbl.o \
|
|
|
|
|
paca.o ioctl32.o cpu_setup_power4.o \
|
|
|
|
|
firmware.o sysfs.o idle_64.o
|
|
|
|
|
obj-$(CONFIG_PPC64) += vdso64/
|
|
|
|
|
obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
|
|
|
|
|
obj-$(CONFIG_POWER4) += idle_power4.o
|
|
|
|
|
obj-$(CONFIG_PPC_OF) += of_device.o prom_parse.o
|
|
|
|
|
procfs-$(CONFIG_PPC64) := proc_ppc64.o
|
|
|
|
|
obj-$(CONFIG_PROC_FS) += $(procfs-y)
|
|
|
|
|
rtaspci-$(CONFIG_PPC64) := rtas_pci.o
|
|
|
|
|
obj-$(CONFIG_PPC_RTAS) += rtas.o rtas-rtc.o $(rtaspci-y)
|
|
|
|
|
obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
|
|
|
|
|
obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
|
|
|
|
|
obj-$(CONFIG_LPARCFG) += lparcfg.o
|
|
|
|
|
obj-$(CONFIG_IBMVIO) += vio.o
|
|
|
|
|
obj-$(CONFIG_IBMEBUS) += ibmebus.o
|
|
|
|
|
obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o
|
|
|
|
|
obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
|
|
|
|
|
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
|
|
|
|
|
|
|
|
|
|
ifeq ($(CONFIG_PPC_MERGE),y)
|
|
|
|
|
|
|
|
|
|
extra-$(CONFIG_PPC_STD_MMU) := head_32.o
|
|
|
|
|
extra-$(CONFIG_PPC64) := head_64.o
|
|
|
|
|
extra-$(CONFIG_40x) := head_4xx.o
|
|
|
|
|
extra-$(CONFIG_44x) := head_44x.o
|
|
|
|
|
extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o
|
|
|
|
|
extra-$(CONFIG_8xx) := head_8xx.o
|
|
|
|
|
extra-y += vmlinux.lds
|
|
|
|
|
|
|
|
|
|
obj-y += process.o init_task.o time.o \
|
|
|
|
|
prom.o traps.o setup-common.o udbg.o
|
|
|
|
|
obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o systbl.o
|
|
|
|
|
obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o
|
|
|
|
|
obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
|
|
|
|
|
obj-$(CONFIG_MODULES) += ppc_ksyms.o
|
|
|
|
|
obj-$(CONFIG_BOOTX_TEXT) += btext.o
|
|
|
|
|
obj-$(CONFIG_6xx) += idle_6xx.o
|
|
|
|
|
obj-$(CONFIG_SMP) += smp.o
|
|
|
|
|
obj-$(CONFIG_KPROBES) += kprobes.o
|
|
|
|
|
obj-$(CONFIG_SERIAL_8250) += legacy_serial.o udbg_16550.o
|
|
|
|
|
module-$(CONFIG_PPC64) += module_64.o
|
|
|
|
|
obj-$(CONFIG_MODULES) += $(module-y)
|
|
|
|
|
|
|
|
|
|
pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o pci_iommu.o \
|
|
|
|
|
pci_direct_iommu.o iomap.o
|
|
|
|
|
obj-$(CONFIG_PCI) += $(pci64-y)
|
[PATCH] powerpc: Merge kexec
This patch merges, to some extent, the PPC32 and PPC64 kexec implementations.
We adopt the PPC32 approach of having ppc_md callbacks for the kexec functions.
The current PPC64 implementation becomes the "default" implementation for PPC64
which platforms can select if they need no special treatment.
I've added these default callbacks to pseries/maple/cell/powermac, this means
iSeries no longer supports kexec - but it never worked anyway.
I've renamed PPC32's machine_kexec_simple to default_machine_kexec, inline with
PPC64. Judging by the comments it might be better named machine_kexec_non_of,
or something, but at the moment it's the only implementation for PPC32 so it's
the "default".
Kexec requires machine_shutdown(), which is in machine_kexec.c on PPC32, but we
already have in setup-common.c on powerpc. All this does is call
ppc_md.nvram_sync, which only powermac implements, so instead make
machine_shutdown a ppc_md member and have it call core99_nvram_sync directly
on powermac.
I've also stuck relocate_kernel.S into misc_32.S for powerpc.
Built for ARCH=ppc, and 32 & 64 bit ARCH=powerpc, with KEXEC=y/n. Booted on
P5 LPAR and successfully kexec'ed.
Should apply on top of 493f25ef4087395891c99fcfe2c72e62e293e89f.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
19 years ago
|
|
|
kexec-$(CONFIG_PPC64) := machine_kexec_64.o
|
|
|
|
|
kexec-$(CONFIG_PPC32) := machine_kexec_32.o
|
|
|
|
|
obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o $(kexec-y)
|
|
|
|
|
|
|
|
|
|
ifeq ($(CONFIG_PPC_ISERIES),y)
|
|
|
|
|
$(obj)/head_64.o: $(obj)/lparmap.s
|
|
|
|
|
AFLAGS_head_64.o += -I$(obj)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
# stuff used from here for ARCH=ppc
|
|
|
|
|
smpobj-$(CONFIG_SMP) += smp.o
|
|
|
|
|
|
|
|
|
|
endif
|
[PATCH] powerpc: Fix handling of fpscr on 64-bit
The recent merge of fpu.S broken the handling of fpscr for
ARCH=powerpc and CONFIG_PPC64=y. FP registers could be corrupted,
leading to strange random application crashes.
The confusion arises, because the thread_struct has (and requires) a
64-bit area to save the fpscr, because we use load/store double
instructions to get it in to/out of the FPU. However, only the low
32-bits are actually used, so we want to treat it as a 32-bit quantity
when manipulating its bits to avoid extra load/stores on 32-bit. This
patch replaces the current definition with a structure of two 32-bit
quantities (pad and val), to clarify things as much as is possible.
The 'val' field is used when manipulating bits, the structure itself
is used when obtaining the address for loading/unloading the value
from the FPU.
While we're at it, consolidate the 4 (!) almost identical versions of
cvt_fd() and cvt_df() (arch/ppc/kernel/misc.S,
arch/ppc64/kernel/misc.S, arch/powerpc/kernel/misc_32.S,
arch/powerpc/kernel/misc_64.S) into a single version in fpu.S. The
new version takes a pointer to thread_struct and applies the correct
offset itself, rather than a pointer to the fpscr field itself, again
to avoid confusion as to which is the correct field to use.
Finally, this patch makes ARCH=ppc64 also use the consolidated fpu.S
code, which it previously did not.
Built for G5 (ARCH=ppc64 and ARCH=powerpc), 32-bit powermac (ARCH=ppc
and ARCH=powerpc) and Walnut (ARCH=ppc, CONFIG_MATH_EMULATION=y).
Booted on G5 (ARCH=powerpc) and things which previously fell over no
longer do.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
19 years ago
|
|
|
|
|
|
|
|
obj-$(CONFIG_PPC64) += $(obj64-y)
|
|
|
|
|
|
[PATCH] powerpc: Fix handling of fpscr on 64-bit
The recent merge of fpu.S broken the handling of fpscr for
ARCH=powerpc and CONFIG_PPC64=y. FP registers could be corrupted,
leading to strange random application crashes.
The confusion arises, because the thread_struct has (and requires) a
64-bit area to save the fpscr, because we use load/store double
instructions to get it in to/out of the FPU. However, only the low
32-bits are actually used, so we want to treat it as a 32-bit quantity
when manipulating its bits to avoid extra load/stores on 32-bit. This
patch replaces the current definition with a structure of two 32-bit
quantities (pad and val), to clarify things as much as is possible.
The 'val' field is used when manipulating bits, the structure itself
is used when obtaining the address for loading/unloading the value
from the FPU.
While we're at it, consolidate the 4 (!) almost identical versions of
cvt_fd() and cvt_df() (arch/ppc/kernel/misc.S,
arch/ppc64/kernel/misc.S, arch/powerpc/kernel/misc_32.S,
arch/powerpc/kernel/misc_64.S) into a single version in fpu.S. The
new version takes a pointer to thread_struct and applies the correct
offset itself, rather than a pointer to the fpscr field itself, again
to avoid confusion as to which is the correct field to use.
Finally, this patch makes ARCH=ppc64 also use the consolidated fpu.S
code, which it previously did not.
Built for G5 (ARCH=ppc64 and ARCH=powerpc), 32-bit powermac (ARCH=ppc
and ARCH=powerpc) and Walnut (ARCH=ppc, CONFIG_MATH_EMULATION=y).
Booted on G5 (ARCH=powerpc) and things which previously fell over no
longer do.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
19 years ago
|
|
|
extra-$(CONFIG_PPC_FPU) += fpu.o
|
|
|
|
|
extra-$(CONFIG_PPC64) += entry_64.o
|
