Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / arch / m68knommu / Makefile

diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index 73a7ea4ffc15f08bd580ea309371c298e0c6e554..92227aaaa26e7e9f1bcb76cb02b1f74b2d2d2131 100644 (file)
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -21,10 +21,13 @@ platform-$(CONFIG_M527x)    := 527x
 platform-$(CONFIG_M5272)       := 5272
 platform-$(CONFIG_M528x)       := 528x
 platform-$(CONFIG_M5307)       := 5307
+platform-$(CONFIG_M532x)       := 532x
 platform-$(CONFIG_M5407)       := 5407
 PLATFORM := $(platform-y)
 
 board-$(CONFIG_PILOT)          := pilot
+board-$(CONFIG_UC5272)          := UC5272
+board-$(CONFIG_UC5282)          := UC5282
 board-$(CONFIG_UCSIMM)         := ucsimm
 board-$(CONFIG_UCDIMM)         := ucdimm
 board-$(CONFIG_UCQUICC)                := uCquicc
@@ -44,6 +47,7 @@ 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
@@ -65,6 +69,7 @@ cpuclass-$(CONFIG_M527x)      := 5307
 cpuclass-$(CONFIG_M5272)       := 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
@@ -97,11 +102,11 @@ cflags-$(CONFIG_M68EZ328)  := -m68000
 cflags-$(CONFIG_M68VZ328)      := -m68000
 cflags-$(CONFIG_M68360)                := -m68332
 
-AFLAGS += $(cflags-y)
+KBUILD_AFLAGS += $(cflags-y)
 
-CFLAGS += $(cflags-y)
-CFLAGS += -D__linux__
-CFLAGS += -DUTS_SYSNAME=\"uClinux\"
+KBUILD_CFLAGS += $(cflags-y)
+KBUILD_CFLAGS += -D__linux__
+KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\"
 
 head-y := arch/m68knommu/platform/$(cpuclass-y)/head.o