diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2010-05-30 16:27:10 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 13:25:45 +0100 |
| commit | 5d25b01cf90c1a27d196a52f48d5364458b80b86 (patch) | |
| tree | 63d0811ba1a2f5e964d872047d3c2944996be349 | |
| 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>
| -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 6ce938200bb..e322d65f33a 100644 --- a/arch/mips/Kbuild +++ b/arch/mips/Kbuild @@ -3,6 +3,9 @@ # CFLAGS_<file.o> := -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/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms new file mode 100644 index 00000000000..681b2d4d88f --- /dev/null +++ b/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/arch/mips/Makefile b/arch/mips/Makefile index d39be470828..b4ec8e9960b 100644 --- a/arch/mips/Makefile +++ b/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/arch/mips/ar7/Makefile b/arch/mips/ar7/Makefile index 26bc5da1899..7435e44b396 100644 --- a/arch/mips/ar7/Makefile +++ b/arch/mips/ar7/Makefile @@ -8,4 +8,3 @@ obj-y := \ platform.o \ gpio.o \ clock.o -EXTRA_CFLAGS += -Werror diff --git a/arch/mips/ar7/Platform b/arch/mips/ar7/Platform new file mode 100644 index 00000000000..0bf85c416c6 --- /dev/null +++ b/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 |