From bbd9fbda92fa169f1f65dd8f15754f2f2a825d56 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sun, 30 May 2010 16:27:10 +0200 Subject: [PATCH] --- yaml --- r: 204489 b: refs/heads/master c: 5d25b01cf90c1a27d196a52f48d5364458b80b86 h: refs/heads/master i: 204487: a86b3d6849cc124d6a2852283d87f61628e4f923 v: v3 --- [refs] | 2 +- trunk/arch/mips/Kbuild | 3 +++ trunk/arch/mips/Kbuild.platforms | 6 ++++++ trunk/arch/mips/Makefile | 8 +------- trunk/arch/mips/ar7/Makefile | 1 - trunk/arch/mips/ar7/Platform | 6 ++++++ 6 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 trunk/arch/mips/Kbuild.platforms create mode 100644 trunk/arch/mips/ar7/Platform diff --git a/[refs] b/[refs] index 2b24dad11e1a..e9a2d9e4fcde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66f9ba101f54bda63ab1db97f9e9e94763d0651b +refs/heads/master: 5d25b01cf90c1a27d196a52f48d5364458b80b86 diff --git a/trunk/arch/mips/Kbuild b/trunk/arch/mips/Kbuild index 6ce938200bbd..e322d65f33a4 100644 --- a/trunk/arch/mips/Kbuild +++ b/trunk/arch/mips/Kbuild @@ -3,6 +3,9 @@ # CFLAGS_ := -Wno-error subdir-ccflags-y := -Werror +# platform specific definitions +include arch/mips/Kbuild.platforms +obj-y := $(platform-y) # mips object files # The object files are linked as core-y files would be linked diff --git a/trunk/arch/mips/Kbuild.platforms b/trunk/arch/mips/Kbuild.platforms new file mode 100644 index 000000000000..681b2d4d88f5 --- /dev/null +++ b/trunk/arch/mips/Kbuild.platforms @@ -0,0 +1,6 @@ +# All platforms listed in alphabetic order + +platforms += ar7 + +# include the platform specific files +include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms)) diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile index d39be4708289..b4ec8e9960b3 100644 --- a/trunk/arch/mips/Makefile +++ b/trunk/arch/mips/Makefile @@ -209,13 +209,7 @@ endif # # Board-dependent options and extra files # - -# -# Texas Instruments AR7 -# -core-$(CONFIG_AR7) += arch/mips/ar7/ -cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7 -load-$(CONFIG_AR7) += 0xffffffff94100000 +include $(srctree)/arch/mips/Kbuild.platforms # # Acer PICA 61, Mips Magnum 4000 and Olivetti M700. diff --git a/trunk/arch/mips/ar7/Makefile b/trunk/arch/mips/ar7/Makefile index 26bc5da18997..7435e44b3964 100644 --- a/trunk/arch/mips/ar7/Makefile +++ b/trunk/arch/mips/ar7/Makefile @@ -8,4 +8,3 @@ obj-y := \ platform.o \ gpio.o \ clock.o -EXTRA_CFLAGS += -Werror diff --git a/trunk/arch/mips/ar7/Platform b/trunk/arch/mips/ar7/Platform new file mode 100644 index 000000000000..0bf85c416c6c --- /dev/null +++ b/trunk/arch/mips/ar7/Platform @@ -0,0 +1,6 @@ +# +# Texas Instruments AR7 +# +platform-$(CONFIG_AR7) += ar7/ +cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7 +load-$(CONFIG_AR7) += 0xffffffff94100000