diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2010-05-30 10:27:10 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 08:25:45 -0400 |
commit | 5d25b01cf90c1a27d196a52f48d5364458b80b86 (patch) | |
tree | 63d0811ba1a2f5e964d872047d3c2944996be349 /arch/mips | |
parent | 66f9ba101f54bda63ab1db97f9e9e94763d0651b (diff) |
MIPS: Introduce support for Platform definitions
Move platform specific definitions to the platfrom directories.
Each platform shall do the following:
1) include an entry in arch/mips/Kbuild.platforms
2) add relevant definitions to arch/mips/<platform>/Platform
This commits changes ar7 to the new scheme as an example.
Introducing a platform speecific Platfrom file has following advantages:
1) decentralization of platfrom definitions
2) simplification af arch/mips/Makefile
3) force all platfrom to build with -Werror (done in arch/mips/Kbuild)
[Ralf: Remove forgotten -Werror from AR7 Makefile]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
To: linux-mips <linux-mips@linux-mips.org>
To: Wu Zhangjin <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/1302/
Patchwork: http://patchwork.linux-mips.org/patch/1308/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kbuild | 3 | ||||
-rw-r--r-- | arch/mips/Kbuild.platforms | 6 | ||||
-rw-r--r-- | arch/mips/Makefile | 8 | ||||
-rw-r--r-- | arch/mips/ar7/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/ar7/Platform | 6 |
5 files changed, 16 insertions, 8 deletions
diff --git a/arch/mips/Kbuild b/arch/mips/Kbuild index 6ce938200bbd..e322d65f33a4 100644 --- a/arch/mips/Kbuild +++ b/arch/mips/Kbuild | |||
@@ -3,6 +3,9 @@ | |||
3 | # CFLAGS_<file.o> := -Wno-error | 3 | # CFLAGS_<file.o> := -Wno-error |
4 | subdir-ccflags-y := -Werror | 4 | subdir-ccflags-y := -Werror |
5 | 5 | ||
6 | # platform specific definitions | ||
7 | include arch/mips/Kbuild.platforms | ||
8 | obj-y := $(platform-y) | ||
6 | 9 | ||
7 | # mips object files | 10 | # mips object files |
8 | # The object files are linked as core-y files would be linked | 11 | # The object files are linked as core-y files would be linked |
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms new file mode 100644 index 000000000000..681b2d4d88f5 --- /dev/null +++ b/arch/mips/Kbuild.platforms | |||
@@ -0,0 +1,6 @@ | |||
1 | # All platforms listed in alphabetic order | ||
2 | |||
3 | platforms += ar7 | ||
4 | |||
5 | # include the platform specific files | ||
6 | include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms)) | ||
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index d39be4708289..b4ec8e9960b3 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -209,13 +209,7 @@ endif | |||
209 | # | 209 | # |
210 | # Board-dependent options and extra files | 210 | # Board-dependent options and extra files |
211 | # | 211 | # |
212 | 212 | include $(srctree)/arch/mips/Kbuild.platforms | |
213 | # | ||
214 | # Texas Instruments AR7 | ||
215 | # | ||
216 | core-$(CONFIG_AR7) += arch/mips/ar7/ | ||
217 | cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7 | ||
218 | load-$(CONFIG_AR7) += 0xffffffff94100000 | ||
219 | 213 | ||
220 | # | 214 | # |
221 | # Acer PICA 61, Mips Magnum 4000 and Olivetti M700. | 215 | # Acer PICA 61, Mips Magnum 4000 and Olivetti M700. |
diff --git a/arch/mips/ar7/Makefile b/arch/mips/ar7/Makefile index 26bc5da18997..7435e44b3964 100644 --- a/arch/mips/ar7/Makefile +++ b/arch/mips/ar7/Makefile | |||
@@ -8,4 +8,3 @@ obj-y := \ | |||
8 | platform.o \ | 8 | platform.o \ |
9 | gpio.o \ | 9 | gpio.o \ |
10 | clock.o | 10 | clock.o |
11 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/ar7/Platform b/arch/mips/ar7/Platform new file mode 100644 index 000000000000..0bf85c416c6c --- /dev/null +++ b/arch/mips/ar7/Platform | |||
@@ -0,0 +1,6 @@ | |||
1 | # | ||
2 | # Texas Instruments AR7 | ||
3 | # | ||
4 | platform-$(CONFIG_AR7) += ar7/ | ||
5 | cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7 | ||
6 | load-$(CONFIG_AR7) += 0xffffffff94100000 | ||