* [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall
@ 2014-04-05 5:39 Daniel Palmer
2014-04-05 5:39 ` [PATCH 2/2] m68k: Only allow for one member of the DragonBall family to be selected in Kconfig. The support code for these chips doesn't currently handle support for multiple family members to be supported in a single kernel image Daniel Palmer
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Daniel Palmer @ 2014-04-05 5:39 UTC (permalink / raw
To: linux-m68k; +Cc: Daniel Palmer
Signed-off-by: Daniel Palmer <danieruru@gmail.com>
---
arch/m68k/kernel/setup_no.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 5b16f5d..88c27d9 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -58,17 +58,16 @@ void (*mach_halt)(void);
void (*mach_power_off)(void);
#ifdef CONFIG_M68000
-#define CPU_NAME "MC68000"
-#endif
-#ifdef CONFIG_M68328
+#if defined(CONFIG_M68328)
#define CPU_NAME "MC68328"
-#endif
-#ifdef CONFIG_M68EZ328
+#elif defined(CONFIG_M68EZ328)
#define CPU_NAME "MC68EZ328"
-#endif
-#ifdef CONFIG_M68VZ328
+#elif defined(CONFIG_M68VZ328)
#define CPU_NAME "MC68VZ328"
+#else
+#define CPU_NAME "MC68000"
#endif
+#endif /* CONFIG_M68000 */
#ifdef CONFIG_M68360
#define CPU_NAME "MC68360"
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] m68k: Only allow for one member of the DragonBall family to be selected in Kconfig. The support code for these chips doesn't currently handle support for multiple family members to be supported in a single kernel image.
2014-04-05 5:39 [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall Daniel Palmer
@ 2014-04-05 5:39 ` Daniel Palmer
2014-04-05 7:42 ` [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall Geert Uytterhoeven
2014-04-05 8:05 ` [PATCH v2 1/2] m68k: fix a compiler warning " Daniel Palmer
2 siblings, 0 replies; 6+ messages in thread
From: Daniel Palmer @ 2014-04-05 5:39 UTC (permalink / raw
To: linux-m68k; +Cc: Daniel Palmer
Signed-off-by: Daniel Palmer <danieruru@gmail.com>
---
arch/m68k/Kconfig.cpu | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 33013df..1ca7cbe 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -93,27 +93,29 @@ config M68060
If you anticipate running this kernel on a computer with a MC68060
processor, say Y. Otherwise, say N.
+choice
+ prompt "DragonBall SoC family support"
+ depends on M68000
+ help
+ Select which member of the DragonBall SoC family to support.
+
config M68328
bool "MC68328"
- depends on !MMU
- select M68000
help
Motorola 68328 processor support.
config M68EZ328
bool "MC68EZ328"
- depends on !MMU
- select M68000
help
- Motorola 68EX328 processor support.
+ Motorola 68EZ328 processor support.
config M68VZ328
bool "MC68VZ328"
- depends on !MMU
- select M68000
help
Motorola 68VZ328 processor support.
+endchoice
+
config M68360
bool "MC68360"
depends on !MMU
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall
2014-04-05 5:39 [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall Daniel Palmer
2014-04-05 5:39 ` [PATCH 2/2] m68k: Only allow for one member of the DragonBall family to be selected in Kconfig. The support code for these chips doesn't currently handle support for multiple family members to be supported in a single kernel image Daniel Palmer
@ 2014-04-05 7:42 ` Geert Uytterhoeven
2014-04-05 7:46 ` Daniel Palmer
2014-04-05 8:05 ` [PATCH v2 1/2] m68k: fix a compiler warning " Daniel Palmer
2 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2014-04-05 7:42 UTC (permalink / raw
To: Daniel Palmer; +Cc: linux-m68k
Hi Daniel,
Thanks for your patch!
Can you please show the compiler warnings in the description?
That helps reviewers, and will make this patch show up if someone
searches for the compiler warnings using e.g. Google.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvald
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall
2014-04-05 7:42 ` [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall Geert Uytterhoeven
@ 2014-04-05 7:46 ` Daniel Palmer
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Palmer @ 2014-04-05 7:46 UTC (permalink / raw
To: Geert Uytterhoeven; +Cc: linux-m68k
Sure, it's just GCC complaining that the CPU name has already been
defined. It's minor :)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] m68k: fix a compiler warning when building for DragonBall
2014-04-05 5:39 [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall Daniel Palmer
2014-04-05 5:39 ` [PATCH 2/2] m68k: Only allow for one member of the DragonBall family to be selected in Kconfig. The support code for these chips doesn't currently handle support for multiple family members to be supported in a single kernel image Daniel Palmer
2014-04-05 7:42 ` [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall Geert Uytterhoeven
@ 2014-04-05 8:05 ` Daniel Palmer
2014-04-08 7:13 ` Greg Ungerer
2 siblings, 1 reply; 6+ messages in thread
From: Daniel Palmer @ 2014-04-05 8:05 UTC (permalink / raw
To: linux-m68k; +Cc: Daniel Palmer
In file included from arch/m68k/kernel/setup.c:4:0:
arch/m68k/kernel/setup_no.c:70:0: warning: "CPU_NAME" redefined [enabled by default]
#define CPU_NAME "MC68VZ328"
^
arch/m68k/kernel/setup_no.c:61:0: note: this is the location of the previous definition
#define CPU_NAME "MC68000"
^
Signed-off-by: Daniel Palmer <danieruru@gmail.com>
---
arch/m68k/kernel/setup_no.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 5b16f5d..88c27d9 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -58,17 +58,16 @@ void (*mach_halt)(void);
void (*mach_power_off)(void);
#ifdef CONFIG_M68000
-#define CPU_NAME "MC68000"
-#endif
-#ifdef CONFIG_M68328
+#if defined(CONFIG_M68328)
#define CPU_NAME "MC68328"
-#endif
-#ifdef CONFIG_M68EZ328
+#elif defined(CONFIG_M68EZ328)
#define CPU_NAME "MC68EZ328"
-#endif
-#ifdef CONFIG_M68VZ328
+#elif defined(CONFIG_M68VZ328)
#define CPU_NAME "MC68VZ328"
+#else
+#define CPU_NAME "MC68000"
#endif
+#endif /* CONFIG_M68000 */
#ifdef CONFIG_M68360
#define CPU_NAME "MC68360"
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] m68k: fix a compiler warning when building for DragonBall
2014-04-05 8:05 ` [PATCH v2 1/2] m68k: fix a compiler warning " Daniel Palmer
@ 2014-04-08 7:13 ` Greg Ungerer
0 siblings, 0 replies; 6+ messages in thread
From: Greg Ungerer @ 2014-04-08 7:13 UTC (permalink / raw
To: Daniel Palmer; +Cc: linux-m68k
Hi Daniel,
On 05/04/14 18:05, Daniel Palmer wrote:
> In file included from arch/m68k/kernel/setup.c:4:0:
> arch/m68k/kernel/setup_no.c:70:0: warning: "CPU_NAME" redefined [enabled by default]
> #define CPU_NAME "MC68VZ328"
> ^
> arch/m68k/kernel/setup_no.c:61:0: note: this is the location of the previous definition
> #define CPU_NAME "MC68000"
> ^
>
> Signed-off-by: Daniel Palmer <danieruru@gmail.com>
Thanks, I'll add this to the m68knommu git tree.
Regards
Greg
> arch/m68k/kernel/setup_no.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
> index 5b16f5d..88c27d9 100644
> --- a/arch/m68k/kernel/setup_no.c
> +++ b/arch/m68k/kernel/setup_no.c
> @@ -58,17 +58,16 @@ void (*mach_halt)(void);
> void (*mach_power_off)(void);
>
> #ifdef CONFIG_M68000
> -#define CPU_NAME "MC68000"
> -#endif
> -#ifdef CONFIG_M68328
> +#if defined(CONFIG_M68328)
> #define CPU_NAME "MC68328"
> -#endif
> -#ifdef CONFIG_M68EZ328
> +#elif defined(CONFIG_M68EZ328)
> #define CPU_NAME "MC68EZ328"
> -#endif
> -#ifdef CONFIG_M68VZ328
> +#elif defined(CONFIG_M68VZ328)
> #define CPU_NAME "MC68VZ328"
> +#else
> +#define CPU_NAME "MC68000"
> #endif
> +#endif /* CONFIG_M68000 */
> #ifdef CONFIG_M68360
> #define CPU_NAME "MC68360"
> #endif
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-04-08 7:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-05 5:39 [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall Daniel Palmer
2014-04-05 5:39 ` [PATCH 2/2] m68k: Only allow for one member of the DragonBall family to be selected in Kconfig. The support code for these chips doesn't currently handle support for multiple family members to be supported in a single kernel image Daniel Palmer
2014-04-05 7:42 ` [PATCH 1/2] m68k: fix some compiler warnings when building for DragonBall Geert Uytterhoeven
2014-04-05 7:46 ` Daniel Palmer
2014-04-05 8:05 ` [PATCH v2 1/2] m68k: fix a compiler warning " Daniel Palmer
2014-04-08 7:13 ` Greg Ungerer
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.