summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-10-19 06:15:08 (GMT)
committerGreg Ungerer <gerg@uclinux.org>2011-12-30 00:20:48 (GMT)
commit3f0060b0e8db431cf2c76b9a94774f0efd9ab956 (patch)
tree6e8e4a17e67de3c9e81fe9f0bc226f899ab20da6 /arch/m68k
parent0a2796da1182a7dcfba41f796f45986237bc1688 (diff)
downloadlinux-fsl-qoriq-3f0060b0e8db431cf2c76b9a94774f0efd9ab956.tar.xz
m68k: do not use m68k startup or interrupt code for ColdFire CPUs
The ColdFire CPUs have their own startup and interrupt code (in the platform/coldfire directory), and do not use the general m68k startup and interrupt code. In fact the use of the arch/m68k/kernel/head.o is not about CONFIG_MMU or not, it is really about the machine type we are compiling for. Modify the selection and use of head.o to be based on the machine type. Only select the local ints.o and vectors.o code if we are using the classic 68k CPU types (that use the conventional Morotola MMU or SUN3 MMU). Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Matt Waddel <mwaddel@yahoo.com> Acked-by: Kurt Mahan <kmahan@xmission.com>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/kernel/Makefile14
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index ea0a396..40d29a78 100644
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -2,16 +2,24 @@
# Makefile for the linux kernel.
#
-extra-$(CONFIG_MMU) := head.o
+extra-$(CONFIG_AMIGA) := head.o
+extra-$(CONFIG_ATARI) := head.o
+extra-$(CONFIG_MAC) := head.o
+extra-$(CONFIG_APOLLO) := head.o
+extra-$(CONFIG_VME) := head.o
+extra-$(CONFIG_HP300) := head.o
+extra-$(CONFIG_Q40) := head.o
+extra-$(CONFIG_SUN3X) := head.o
extra-$(CONFIG_SUN3) := sun3-head.o
extra-y += vmlinux.lds
obj-y := entry.o init_task.o irq.o m68k_ksyms.o module.o process.o ptrace.o
obj-y += setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o
-obj-$(CONFIG_MMU) += ints.o vectors.o
+obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o
+obj-$(CONFIG_MMU_SUN3) += ints.o vectors.o
ifndef CONFIG_MMU_SUN3
-obj-y += dma.o
+obj-y += dma.o
endif