* [PATCH -queue] MIPS: Move Alchemy Makefile parts to their own Platform file.
@ 2010-05-31 19:07 Manuel Lauss
2010-05-31 21:18 ` Sam Ravnborg
0 siblings, 1 reply; 4+ messages in thread
From: Manuel Lauss @ 2010-05-31 19:07 UTC (permalink / raw)
To: Linux-MIPS; +Cc: Manuel Lauss, Sam Ravnborg
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
---
Applies on top of Sam's MIPS Kbuild patches in mips-queue.
Build-tested only.
arch/mips/Kbuild.platforms | 2 +-
arch/mips/Makefile | 105 --------------------------------------------
arch/mips/alchemy/Platform | 103 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 104 insertions(+), 106 deletions(-)
create mode 100644 arch/mips/alchemy/Platform
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 681b2d4..18eff23 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -1,6 +1,6 @@
# All platforms listed in alphabetic order
-platforms += ar7
+platforms += alchemy ar7
# include the platform specific files
include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ff71a54..b75b72b 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -219,111 +219,6 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctree)/arch/mips/include/asm/mach-jazz
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
#
-# Common Alchemy Au1x00 stuff
-#
-core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/
-
-#
-# AMD Alchemy Pb1000 eval board
-#
-core-$(CONFIG_MIPS_PB1000) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_PB1000) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
-load-$(CONFIG_MIPS_PB1000) += 0xffffffff80100000
-
-#
-# AMD Alchemy Pb1100 eval board
-#
-core-$(CONFIG_MIPS_PB1100) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_PB1100) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
-load-$(CONFIG_MIPS_PB1100) += 0xffffffff80100000
-
-#
-# AMD Alchemy Pb1500 eval board
-#
-core-$(CONFIG_MIPS_PB1500) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_PB1500) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
-load-$(CONFIG_MIPS_PB1500) += 0xffffffff80100000
-
-#
-# AMD Alchemy Pb1550 eval board
-#
-core-$(CONFIG_MIPS_PB1550) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_PB1550) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
-load-$(CONFIG_MIPS_PB1550) += 0xffffffff80100000
-
-#
-# AMD Alchemy Pb1200 eval board
-#
-core-$(CONFIG_MIPS_PB1200) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_PB1200) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
-load-$(CONFIG_MIPS_PB1200) += 0xffffffff80100000
-
-#
-# AMD Alchemy Db1000 eval board
-#
-core-$(CONFIG_MIPS_DB1000) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1000) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1000) += 0xffffffff80100000
-
-#
-# AMD Alchemy Db1100 eval board
-#
-core-$(CONFIG_MIPS_DB1100) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1100) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1100) += 0xffffffff80100000
-
-#
-# AMD Alchemy Db1500 eval board
-#
-core-$(CONFIG_MIPS_DB1500) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1500) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1500) += 0xffffffff80100000
-
-#
-# AMD Alchemy Db1550 eval board
-#
-core-$(CONFIG_MIPS_DB1550) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1550) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1550) += 0xffffffff80100000
-
-#
-# AMD Alchemy Db1200 eval board
-#
-core-$(CONFIG_MIPS_DB1200) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1200) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1200) += 0xffffffff80100000
-
-#
-# AMD Alchemy Bosporus eval board
-#
-core-$(CONFIG_MIPS_BOSPORUS) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_BOSPORUS) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_BOSPORUS) += 0xffffffff80100000
-
-#
-# AMD Alchemy Mirage eval board
-#
-core-$(CONFIG_MIPS_MIRAGE) += arch/mips/alchemy/devboards/
-cflags-$(CONFIG_MIPS_MIRAGE) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_MIRAGE) += 0xffffffff80100000
-
-#
-# 4G-Systems eval board
-#
-libs-$(CONFIG_MIPS_MTX1) += arch/mips/alchemy/mtx-1/
-load-$(CONFIG_MIPS_MTX1) += 0xffffffff80100000
-
-#
-# MyCable eval board
-#
-libs-$(CONFIG_MIPS_XXS1500) += arch/mips/alchemy/xxs1500/
-load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000
-
-# must be last for Alchemy systems for GPIO to work properly
-cflags-$(CONFIG_SOC_AU1X00) += -I$(srctree)/arch/mips/include/asm/mach-au1x00
-
-
-#
# Cobalt Server
#
core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/
diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
new file mode 100644
index 0000000..1994fdc
--- /dev/null
+++ b/arch/mips/alchemy/Platform
@@ -0,0 +1,103 @@
+#
+# Common Alchemy Au1x00 stuff
+#
+core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/
+
+#
+# AMD Alchemy Pb1000 eval board
+#
+core-$(CONFIG_MIPS_PB1000) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_PB1000) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
+load-$(CONFIG_MIPS_PB1000) += 0xffffffff80100000
+
+#
+# AMD Alchemy Pb1100 eval board
+#
+core-$(CONFIG_MIPS_PB1100) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_PB1100) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
+load-$(CONFIG_MIPS_PB1100) += 0xffffffff80100000
+
+#
+# AMD Alchemy Pb1500 eval board
+#
+core-$(CONFIG_MIPS_PB1500) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_PB1500) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
+load-$(CONFIG_MIPS_PB1500) += 0xffffffff80100000
+
+#
+# AMD Alchemy Pb1550 eval board
+#
+core-$(CONFIG_MIPS_PB1550) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_PB1550) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
+load-$(CONFIG_MIPS_PB1550) += 0xffffffff80100000
+
+#
+# AMD Alchemy Pb1200 eval board
+#
+core-$(CONFIG_MIPS_PB1200) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_PB1200) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00
+load-$(CONFIG_MIPS_PB1200) += 0xffffffff80100000
+
+#
+# AMD Alchemy Db1000 eval board
+#
+core-$(CONFIG_MIPS_DB1000) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_DB1000) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_DB1000) += 0xffffffff80100000
+
+#
+# AMD Alchemy Db1100 eval board
+#
+core-$(CONFIG_MIPS_DB1100) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_DB1100) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_DB1100) += 0xffffffff80100000
+
+#
+# AMD Alchemy Db1500 eval board
+#
+core-$(CONFIG_MIPS_DB1500) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_DB1500) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_DB1500) += 0xffffffff80100000
+
+#
+# AMD Alchemy Db1550 eval board
+#
+core-$(CONFIG_MIPS_DB1550) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_DB1550) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_DB1550) += 0xffffffff80100000
+
+#
+# AMD Alchemy Db1200 eval board
+#
+core-$(CONFIG_MIPS_DB1200) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_DB1200) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_DB1200) += 0xffffffff80100000
+
+#
+# AMD Alchemy Bosporus eval board
+#
+core-$(CONFIG_MIPS_BOSPORUS) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_BOSPORUS) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_BOSPORUS) += 0xffffffff80100000
+
+#
+# AMD Alchemy Mirage eval board
+#
+core-$(CONFIG_MIPS_MIRAGE) += arch/mips/alchemy/devboards/
+cflags-$(CONFIG_MIPS_MIRAGE) += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+load-$(CONFIG_MIPS_MIRAGE) += 0xffffffff80100000
+
+#
+# 4G-Systems eval board
+#
+libs-$(CONFIG_MIPS_MTX1) += arch/mips/alchemy/mtx-1/
+load-$(CONFIG_MIPS_MTX1) += 0xffffffff80100000
+
+#
+# MyCable eval board
+#
+libs-$(CONFIG_MIPS_XXS1500) += arch/mips/alchemy/xxs1500/
+load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000
+
+# must be last for Alchemy systems for GPIO to work properly
+cflags-$(CONFIG_SOC_AU1X00) += -I$(srctree)/arch/mips/include/asm/mach-au1x00
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH -queue] MIPS: Move Alchemy Makefile parts to their own Platform file.
2010-05-31 19:07 [PATCH -queue] MIPS: Move Alchemy Makefile parts to their own Platform file Manuel Lauss
@ 2010-05-31 21:18 ` Sam Ravnborg
2010-06-01 6:23 ` Manuel Lauss
0 siblings, 1 reply; 4+ messages in thread
From: Sam Ravnborg @ 2010-05-31 21:18 UTC (permalink / raw)
To: Manuel Lauss; +Cc: Linux-MIPS
Hi Manuel.
A few comments below.
>
> diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
> index 681b2d4..18eff23 100644
> --- a/arch/mips/Kbuild.platforms
> +++ b/arch/mips/Kbuild.platforms
> @@ -1,6 +1,6 @@
> # All platforms listed in alphabetic order
>
> -platforms += ar7
> +platforms += alchemy ar7
One line per paltform is better.
Then the risk for conflicts are less and merging in easier.
Like this:
platforms += ar7
platforms += alchemy
But this is a nitpick only.
> diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
> new file mode 100644
> index 0000000..1994fdc
> --- /dev/null
> +++ b/arch/mips/alchemy/Platform
> @@ -0,0 +1,103 @@
> +#
> +# Common Alchemy Au1x00 stuff
> +#
> +core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/
The above is actually wrong - despite that it works.
You are supposed to use:
platform-$(CONFIG_SOC_AU1X00) += alchemy/common/
Then arch/mips/Kbuild will pick it up.
And then subdirs-ccflags-y := -Werror will also take effect.
The reason why it works now is that the core-y assignment is
picked up by arch/mips/Makefile.
I could do something to avoid this but I hope this is not needed.
You use core-$(...) in many places that all needs fixing.
Sam
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH -queue] MIPS: Move Alchemy Makefile parts to their own Platform file.
@ 2010-06-01 6:23 ` Manuel Lauss
0 siblings, 0 replies; 4+ messages in thread
From: Manuel Lauss @ 2010-06-01 6:23 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Linux-MIPS
Hi Sam,
On Mon, May 31, 2010 at 11:18 PM, Sam Ravnborg <sam@ravnborg.org> wrote:
>> --- a/arch/mips/Kbuild.platforms
>> +++ b/arch/mips/Kbuild.platforms
>> @@ -1,6 +1,6 @@
>> # All platforms listed in alphabetic order
>>
>> -platforms += ar7
>> +platforms += alchemy ar7
>
> One line per paltform is better.
> Then the risk for conflicts are less and merging in easier.
> Like this:
>
> platforms += ar7
> platforms += alchemy
Done,
>> diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
>> new file mode 100644
>> index 0000000..1994fdc
>> --- /dev/null
>> +++ b/arch/mips/alchemy/Platform
>> @@ -0,0 +1,103 @@
>> +#
>> +# Common Alchemy Au1x00 stuff
>> +#
>> +core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/
>
> The above is actually wrong - despite that it works.
> You are supposed to use:
>
> platform-$(CONFIG_SOC_AU1X00) += alchemy/common/
>
> Then arch/mips/Kbuild will pick it up.
> And then subdirs-ccflags-y := -Werror will also take effect.
Ah, interesting. I shall look at the full commandline in the future.
I'll do a build of all alchemy boards and resend when there are
no breakages.
Thank you!
Manuel Lauss
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH -queue] MIPS: Move Alchemy Makefile parts to their own Platform file.
@ 2010-06-01 6:23 ` Manuel Lauss
0 siblings, 0 replies; 4+ messages in thread
From: Manuel Lauss @ 2010-06-01 6:23 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Linux-MIPS
Hi Sam,
On Mon, May 31, 2010 at 11:18 PM, Sam Ravnborg <sam@ravnborg.org> wrote:
>> --- a/arch/mips/Kbuild.platforms
>> +++ b/arch/mips/Kbuild.platforms
>> @@ -1,6 +1,6 @@
>> # All platforms listed in alphabetic order
>>
>> -platforms += ar7
>> +platforms += alchemy ar7
>
> One line per paltform is better.
> Then the risk for conflicts are less and merging in easier.
> Like this:
>
> platforms += ar7
> platforms += alchemy
Done,
>> diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
>> new file mode 100644
>> index 0000000..1994fdc
>> --- /dev/null
>> +++ b/arch/mips/alchemy/Platform
>> @@ -0,0 +1,103 @@
>> +#
>> +# Common Alchemy Au1x00 stuff
>> +#
>> +core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/
>
> The above is actually wrong - despite that it works.
> You are supposed to use:
>
> platform-$(CONFIG_SOC_AU1X00) += alchemy/common/
>
> Then arch/mips/Kbuild will pick it up.
> And then subdirs-ccflags-y := -Werror will also take effect.
Ah, interesting. I shall look at the full commandline in the future.
I'll do a build of all alchemy boards and resend when there are
no breakages.
Thank you!
Manuel Lauss
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-06-01 6:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-31 19:07 [PATCH -queue] MIPS: Move Alchemy Makefile parts to their own Platform file Manuel Lauss
2010-05-31 21:18 ` Sam Ravnborg
2010-06-01 6:23 ` Manuel Lauss
2010-06-01 6:23 ` Manuel Lauss
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.