Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / m68knommu / Makefile

diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index e6be8b7..8951793 100644 (file)
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -14,10 +14,14 @@ platform-$(CONFIG_M68VZ328) := 68VZ328
 platform-$(CONFIG_M68360)      := 68360
 platform-$(CONFIG_M5206)       := 5206
 platform-$(CONFIG_M5206e)      := 5206e
+platform-$(CONFIG_M520x)       := 520x
+platform-$(CONFIG_M523x)       := 523x
 platform-$(CONFIG_M5249)       := 5249
+platform-$(CONFIG_M527x)       := 527x
 platform-$(CONFIG_M5272)       := 5272
-platform-$(CONFIG_M5282)       := 5282
+platform-$(CONFIG_M528x)       := 528x
 platform-$(CONFIG_M5307)       := 5307
+platform-$(CONFIG_M532x)       := 532x
 platform-$(CONFIG_M5407)       := 5407
 PLATFORM := $(platform-y)
 
@@ -27,18 +31,25 @@ board-$(CONFIG_UCDIMM)              := ucdimm
 board-$(CONFIG_UCQUICC)                := uCquicc
 board-$(CONFIG_DRAGEN2)                := de2
 board-$(CONFIG_ARNEWSH)                := ARNEWSH
-board-$(CONFIG_MOTOROLA)       := MOTOROLA
+board-$(CONFIG_FREESCALE)      := FREESCALE
+board-$(CONFIG_M5235EVB)       := M5235EVB
+board-$(CONFIG_M5271EVB)       := M5271EVB
+board-$(CONFIG_M5275EVB)       := M5275EVB
+board-$(CONFIG_M5282EVB)       := M5282EVB
 board-$(CONFIG_ELITE)          := eLITE
 board-$(CONFIG_eLIA)           := eLIA
 board-$(CONFIG_NETtel)         := NETtel
 board-$(CONFIG_SECUREEDGEMP3)  := MP3
 board-$(CONFIG_CLEOPATRA)      := CLEOPATRA
-board-$(CONFIG_senTec)         := senTec
+board-$(CONFIG_senTec)         := senTec
+board-$(CONFIG_SNEHA)          := SNEHA
+board-$(CONFIG_M5208EVB)       := M5208EVB
+board-$(CONFIG_MOD5272)                := MOD5272
+board-$(CONFIG_AVNET)           := AVNET
 BOARD := $(board-y)
 
 model-$(CONFIG_RAMKERNEL)      := ram
 model-$(CONFIG_ROMKERNEL)      := rom
-model-$(CONFIG_HIMEMKERNEL)    := himem
 MODEL := $(model-y)
 
 #
@@ -49,15 +60,22 @@ MODEL := $(model-y)
 #
 cpuclass-$(CONFIG_M5206)       := 5307
 cpuclass-$(CONFIG_M5206e)      := 5307
+cpuclass-$(CONFIG_M520x)       := 5307
+cpuclass-$(CONFIG_M523x)       := 5307
 cpuclass-$(CONFIG_M5249)       := 5307
+cpuclass-$(CONFIG_M527x)       := 5307
 cpuclass-$(CONFIG_M5272)       := 5307
-cpuclass-$(CONFIG_M5282)       := 5307
+cpuclass-$(CONFIG_M528x)       := 5307
+cpuclass-$(CONFIG_M5307)       := 5307
+cpuclass-$(CONFIG_M532x)       := 5307
 cpuclass-$(CONFIG_M5407)       := 5307
+cpuclass-$(CONFIG_M68328)      := 68328
 cpuclass-$(CONFIG_M68EZ328)    := 68328
 cpuclass-$(CONFIG_M68VZ328)    := 68328
+cpuclass-$(CONFIG_M68360)      := 68360
 CPUCLASS := $(cpuclass-y)
 
-ifneq ($(CPUCLASS),)
+ifneq ($(CPUCLASS),$(PLATFORM))
 CLASSDIR := arch/m68knommu/platform/$(cpuclass-y)/
 endif
 
@@ -66,13 +84,17 @@ export PLATFORM BOARD MODEL CPUCLASS
 #
 # Some CFLAG additions based on specific CPU type.
 #
-cflags-$(CONFIG_M5206)         := -m5200 -Wa,-S -Wa,-m5200
-cflags-$(CONFIG_M5206e)                := -m5200 -Wa,-S -Wa,-m5200
-cflags-$(CONFIG_M5249)         := -m5200 -Wa,-S -Wa,-m5200
-cflags-$(CONFIG_M5272)         := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M5282)         := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M5307)         := -m5307 -Wa,-S -Wa,-m5307
-cflags-$(CONFIG_M5407)         := -m5200 -Wa,-S -Wa,-m5200
+cflags-$(CONFIG_M5206)         := -m5200
+cflags-$(CONFIG_M5206e)                := -m5200
+cflags-$(CONFIG_M520x)         := -m5307
+cflags-$(CONFIG_M523x)         := -m5307
+cflags-$(CONFIG_M5249)         := -m5200
+cflags-$(CONFIG_M527x)         := -m5307
+cflags-$(CONFIG_M5272)         := -m5307
+cflags-$(CONFIG_M528x)         := -m5307
+cflags-$(CONFIG_M5307)         := -m5307
+cflags-$(CONFIG_M532x)         := -m5307
+cflags-$(CONFIG_M5407)         := -m5200
 cflags-$(CONFIG_M68328)                := -m68000
 cflags-$(CONFIG_M68EZ328)      := -m68000
 cflags-$(CONFIG_M68VZ328)      := -m68000
@@ -81,15 +103,10 @@ cflags-$(CONFIG_M68360)            := -m68332
 AFLAGS += $(cflags-y)
 
 CFLAGS += $(cflags-y)
-CFLAGS += -fno-builtin
-CFLAGS += -O2 -g
 CFLAGS += -D__linux__
 CFLAGS += -DUTS_SYSNAME=\"uClinux\"
 
-head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
-
-CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \
-              arch/$(ARCH)/kernel/asm-offsets.s
+head-y := arch/m68knommu/platform/$(cpuclass-y)/head.o
 
 core-y += arch/m68knommu/kernel/ \
           arch/m68knommu/mm/ \
@@ -97,12 +114,5 @@ core-y      += arch/m68knommu/kernel/ \
           arch/m68knommu/platform/$(PLATFORM)/
 libs-y += arch/m68knommu/lib/
 
-prepare: include/asm-$(ARCH)/asm-offsets.h
-
 archclean:
-       $(call descend arch/$(ARCH)/boot, subdirclean)
-
-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
-                                  include/asm include/linux/version.h \
-                                  include/config/MARKER
-       $(call filechk,gen-asm-offsets)
+       $(Q)$(MAKE) $(clean)=arch/m68knommu/boot