Merge tag 'timers-v5.9-rc4' of https://git.linaro.org/people/daniel.lezcano/linux...

[linux-2.6-microblaze.git] / arch / m68k / Makefile

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 0415d28..4438ffb 100644 (file)
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -32,30 +32,33 @@ endif
 #      compiler cpu type flag.
 #
 ifndef CONFIG_M68040
-cpuflags-$(CONFIG_M68060)      := -m68060
+cpuflags-$(CONFIG_M68060)      = -m68060
 endif
 ifndef CONFIG_M68060
-cpuflags-$(CONFIG_M68040)      := -m68040
+cpuflags-$(CONFIG_M68040)      = -m68040
 endif
-cpuflags-$(CONFIG_M68030)      :=
-cpuflags-$(CONFIG_M68020)      :=
-cpuflags-$(CONFIG_M68000)      := -m68000
-cpuflags-$(CONFIG_M5441x)      := $(call cc-option,-mcpu=54455,-mcfv4e)
-cpuflags-$(CONFIG_M54xx)       := $(call cc-option,-mcpu=5475,-m5200)
-cpuflags-$(CONFIG_M5407)       := $(call cc-option,-mcpu=5407,-m5200)
-cpuflags-$(CONFIG_M532x)       := $(call cc-option,-mcpu=532x,-m5307)
-cpuflags-$(CONFIG_M537x)       := $(call cc-option,-mcpu=537x,-m5307)
-cpuflags-$(CONFIG_M5307)       := $(call cc-option,-mcpu=5307,-m5200)
-cpuflags-$(CONFIG_M528x)       := $(call cc-option,-mcpu=528x,-m5307)
-cpuflags-$(CONFIG_M5275)       := $(call cc-option,-mcpu=5275,-m5307)
-cpuflags-$(CONFIG_M5272)       := $(call cc-option,-mcpu=5272,-m5307)
-cpuflags-$(CONFIG_M5271)       := $(call cc-option,-mcpu=5271,-m5307)
-cpuflags-$(CONFIG_M523x)       := $(call cc-option,-mcpu=523x,-m5307)
-cpuflags-$(CONFIG_M525x)       := $(call cc-option,-mcpu=5253,-m5200)
-cpuflags-$(CONFIG_M5249)       := $(call cc-option,-mcpu=5249,-m5200)
-cpuflags-$(CONFIG_M520x)       := $(call cc-option,-mcpu=5208,-m5200)
-cpuflags-$(CONFIG_M5206e)      := $(call cc-option,-mcpu=5206e,-m5200)
-cpuflags-$(CONFIG_M5206)       := $(call cc-option,-mcpu=5206,-m5200)
+cpuflags-$(CONFIG_M68030)      =
+cpuflags-$(CONFIG_M68020)      =
+cpuflags-$(CONFIG_M68000)      = -m68000
+cpuflags-$(CONFIG_M5441x)      = $(call cc-option,-mcpu=54455,-mcfv4e)
+cpuflags-$(CONFIG_M54xx)       = $(call cc-option,-mcpu=5475,-m5200)
+cpuflags-$(CONFIG_M5407)       = $(call cc-option,-mcpu=5407,-m5200)
+cpuflags-$(CONFIG_M532x)       = $(call cc-option,-mcpu=532x,-m5307)
+cpuflags-$(CONFIG_M537x)       = $(call cc-option,-mcpu=537x,-m5307)
+cpuflags-$(CONFIG_M5307)       = $(call cc-option,-mcpu=5307,-m5200)
+cpuflags-$(CONFIG_M528x)       = $(call cc-option,-mcpu=528x,-m5307)
+cpuflags-$(CONFIG_M5275)       = $(call cc-option,-mcpu=5275,-m5307)
+cpuflags-$(CONFIG_M5272)       = $(call cc-option,-mcpu=5272,-m5307)
+cpuflags-$(CONFIG_M5271)       = $(call cc-option,-mcpu=5271,-m5307)
+cpuflags-$(CONFIG_M523x)       = $(call cc-option,-mcpu=523x,-m5307)
+cpuflags-$(CONFIG_M525x)       = $(call cc-option,-mcpu=5253,-m5200)
+cpuflags-$(CONFIG_M5249)       = $(call cc-option,-mcpu=5249,-m5200)
+cpuflags-$(CONFIG_M520x)       = $(call cc-option,-mcpu=5208,-m5200)
+cpuflags-$(CONFIG_M5206e)      = $(call cc-option,-mcpu=5206e,-m5200)
+cpuflags-$(CONFIG_M5206)       = $(call cc-option,-mcpu=5206,-m5200)
+
+# Evaluate tune cc-option calls now
+cpuflags-y := $(cpuflags-y)
 
 KBUILD_AFLAGS += $(cpuflags-y)
 KBUILD_CFLAGS += $(cpuflags-y)
@@ -67,9 +70,8 @@ ifdef CONFIG_MMU
 KBUILD_CFLAGS += -fno-strength-reduce -ffixed-a2
 else
 # we can use a m68k-linux-gcc toolchain with these in place
-KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\"
-KBUILD_CFLAGS += -D__uClinux__
-KBUILD_AFLAGS += -D__uClinux__
+KBUILD_CPPFLAGS += -DUTS_SYSNAME=\"uClinux\"
+KBUILD_CPPFLAGS += -D__uClinux__
 endif
 
 KBUILD_LDFLAGS := -m m68kelf
@@ -97,27 +99,9 @@ head-$(CONFIG_SUN3)          := arch/m68k/kernel/sun3-head.o
 head-$(CONFIG_M68000)          := arch/m68k/68000/head.o
 head-$(CONFIG_COLDFIRE)                := arch/m68k/coldfire/head.o
 
-core-y                         += arch/m68k/kernel/    arch/m68k/mm/
+core-y                         += arch/m68k/
 libs-y                         += arch/m68k/lib/
 
-core-$(CONFIG_Q40)             += arch/m68k/q40/
-core-$(CONFIG_AMIGA)           += arch/m68k/amiga/
-core-$(CONFIG_ATARI)           += arch/m68k/atari/
-core-$(CONFIG_MAC)             += arch/m68k/mac/
-core-$(CONFIG_HP300)           += arch/m68k/hp300/
-core-$(CONFIG_APOLLO)          += arch/m68k/apollo/
-core-$(CONFIG_MVME147)         += arch/m68k/mvme147/
-core-$(CONFIG_MVME16x)         += arch/m68k/mvme16x/
-core-$(CONFIG_BVME6000)                += arch/m68k/bvme6000/
-core-$(CONFIG_SUN3X)           += arch/m68k/sun3x/     arch/m68k/sun3/
-core-$(CONFIG_SUN3)            += arch/m68k/sun3/      arch/m68k/sun3/prom/
-core-$(CONFIG_NATFEAT)         += arch/m68k/emu/
-core-$(CONFIG_M68040)          += arch/m68k/fpsp040/
-core-$(CONFIG_M68060)          += arch/m68k/ifpsp060/
-core-$(CONFIG_M68KFPU_EMU)     += arch/m68k/math-emu/
-core-$(CONFIG_M68000)          += arch/m68k/68000/
-core-$(CONFIG_COLDFIRE)                += arch/m68k/coldfire/
-
 
 all:   zImage
 
@@ -154,8 +138,7 @@ else
        $(KBZIP2) -1c vmlinux >vmlinux.bz2
 endif
 
-archclean:
-       rm -f vmlinux.gz vmlinux.bz2
+CLEAN_FILES += vmlinux.gz vmlinux.bz2
 
 archheaders:
        $(Q)$(MAKE) $(build)=arch/m68k/kernel/syscalls all