m68k: m68328: move platform code to separate files
Subsystems (2)
PATCH 1/2 m68k: m68328: move platform code to separate files
The dragen2 and ucsimm/ucdimm files require a bit of custom code compared to the other dragonball platforms, move them into separate files as a preparation for a build fix.
---
Just a small cleanup after I ran into some issue during build testing my timer patches, the second patch contains the actual bugfix but relies on this preparation patch.
--- arch/m68k/68000/Makefile | 4 ++ arch/m68k/68000/dragen2.c | 100 +++++++++++++++++++++++++++ arch/m68k/68000/m68328.c | 3 +- arch/m68k/68000/m68328.h | 5 ++ arch/m68k/68000/m68EZ328.c | 23 +------ arch/m68k/68000/m68VZ328.c | 136 ++----------------------------------- arch/m68k/68000/ucsimm.c | 38 +++++++++++ 7 files changed, 158 insertions(+), 151 deletions(-) create mode 100644 arch/m68k/68000/dragen2.c create mode 100644 arch/m68k/68000/m68328.h create mode 100644 arch/m68k/68000/ucsimm.c
arch/m68k/68000/Makefile +4 -0
@@ -16,4 +16,8 @@ obj-$(CONFIG_M68EZ328) += m68EZ328.o obj-$(CONFIG_M68VZ328) += m68VZ328.o obj-$(CONFIG_ROM) += romvec.o +obj-$(CONFIG_DRAGEN2) += dragen2.o +obj-$(CONFIG_UCSIMM) += ucsimm.o +obj-$(CONFIG_UCDIMM) += ucsimm.o + extra-y := head.o
arch/m68k/68000/dragen2.c new file +100 -0
100 lines not on this page · raw message
arch/m68k/68000/m68328.c +2 -1
@@ -25,9 +25,10 @@#include "bootlogo.h" #endif +#include "m68328.h" +/***************************************************************************/ -int m68328_hwclk (int set,struct rtc_time *t);/***************************************************************************/
arch/m68k/68000/m68328.h new file +5 -0
@@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +void init_dragen2 (char *command,int size); +void init_ucsimm (char *command,int size); +struct rtc_time ; +int m68328_hwclk (int set,struct rtc_time *t);
arch/m68k/68000/m68EZ328.c +2 -21
@@ -24,9 +24,7 @@#include <asm/bootstd.h> #endif -/***************************************************************************/ - -int m68328_hwclk (int set,struct rtc_time *t); +#include "m68328.h" /***************************************************************************/
@@ -44,29 +42,12 @@ void m68ez328_reset(void)/***************************************************************************/ -unsigned char *cs8900a_hwaddr; -static int errno; - -#ifdef CONFIG_UCSIMM -_bsc0(char *, getserialnum) -_bsc1(unsigned char *, gethwaddr, int, a) -_bsc1(char *, getbenv, char *, a) -#endif -void __init config_BSP (char *command,int len) { -unsigned char *p; -pr_info ("68EZ328 DragonBallEZ support (C) 1999 Rt-Control, Inc\n" );#ifdef CONFIG_UCSIMM -pr_info ("uCsimm serial string [%s]\n" ,getserialnum ()); - p = cs8900a_hwaddr =gethwaddr (0 ); -pr_info ("uCsimm hwaddr %pM\n" , p); - - p =getbenv ("APPEND" ); -if (p)strcpy (p,command); -else command[0 ] =0 ; +init_ucsimm (command, len);#endif mach_sched_init = hw_timer_init;
arch/m68k/68000/m68VZ328.c +7 -129
159 lines not on this page · raw message
arch/m68k/68000/ucsimm.c new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 1993 Hamish Macdonald +* Copyright (C) 1999 D. Jeff Dionne +* Copyright (C) 2001 Georges Menie, Ken Desmet +* +* This file is subject to the terms and conditions of the GNU General Public +* License. See the file COPYING in the main directory of this archive +* for more details. +*/ +#include <linux/init.h> +#include <asm/bootstd.h> +#include <asm/machdep.h> +#include <asm/MC68VZ328.h> + + +#include "m68328.h" + +unsigned char *cs8900a_hwaddr; +static int errno; + +_bsc0(char *, getserialnum) +_bsc1 (unsigned char *,gethwaddr ,int ,a ) +_bsc1(char *, getbenv, char *, a) + +void __init init_ucsimm(char *command, int size) +{ +char *p; + +pr_info ("uCsimm/uCdimm serial string [%s]\n" ,getserialnum ()); + p = cs8900a_hwaddr =gethwaddr (0 ); +pr_info ("uCsimm/uCdimm hwaddr %pM\n" , p); + p =getbenv ("APPEND" ); +if (p) +strcpy (p, command); +else + command[0 ] =0 ; +}
Signature · 1 line
2.27.0
PATCH 2/2 m68k: m68328: remove duplicate code
Building a kernel with multiple dragonball based boards enabled needlessly causes a link failure because of duplicate config_BSP() functions between the CPU versions.
Avoid that merging the three almost identical files into one, and hiding the CPU configuration behind the board config. The pr_info() lines are consolidated in one place.
It is still not possible to run a kernel configured for more than one board, but at least configurations that can be selected can also be built now.
--- arch/m68k/68000/Makefile | 5 +-- arch/m68k/68000/m68328.c | 31 ++++++++++------- arch/m68k/68000/m68EZ328.c | 58 -------------------------------- arch/m68k/68000/m68VZ328.c | 67 ------------------------------------- arch/m68k/Kconfig.cpu | 8 ++--- arch/m68k/Kconfig.machine | 16 +++++---- arch/m68k/kernel/setup_no.c | 9 +++++ 7 files changed, 43 insertions(+), 151 deletions(-) delete mode 100644 arch/m68k/68000/m68EZ328.c delete mode 100644 arch/m68k/68000/m68VZ328.c
arch/m68k/68000/Makefile +1 -4
@@ -10,10 +10,7 @@ # 68328, 68EZ328, 68VZ328 -obj-y += entry.o ints.o timers.o -obj-$(CONFIG_M68328) += m68328.o -obj-$(CONFIG_M68EZ328) += m68EZ328.o -obj-$(CONFIG_M68VZ328) += m68VZ328.o +obj-y += entry.o ints.o timers.o m68328.o obj-$(CONFIG_ROM) += romvec.o obj-$(CONFIG_DRAGEN2) += dragen2.o
arch/m68k/68000/m68328.c +19 -12
@@ -1,10 +1,11 @@/***************************************************************************/ /* -* m68328.c - 68328 specific config +* m68328.c - 68328/68EZ328/68VZ328 specific config * * Copyright (C) 1993 Hamish Macdonald * Copyright (C) 1999 D. Jeff Dionne +* Copyright (C) 2001 Georges Menie, Ken Desmet * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of this archive
@@ -20,8 +21,10 @@#include <linux/kernel.h> #include <linux/rtc.h> #include <asm/machdep.h> -#include <asm/MC68328.h> -#if defined(CONFIG_PILOT ) || defined(CONFIG_INIT_LCD ) + +#if defined(CONFIG_INIT_LCD ) && defined(CONFIG_M68VZ328 ) +#include "bootlogo-vz.h" +#elif defined(CONFIG_PILOT ) || defined(CONFIG_INIT_LCD )#include "bootlogo.h" #endif
@@ -29,10 +32,7 @@/***************************************************************************/ - -/***************************************************************************/ - -void m68328_reset (void ) +static void m68328_reset (void ) {local_irq_disable (); asm volatile ("moveal #0x10c00000, %a0;\n\t"
@@ -46,12 +46,19 @@ void m68328_reset (void)void __init config_BSP (char *command,int len) { -pr_info ("68328 support D. Jeff Dionne <[email protected]>\n" ); -pr_info ("68328 support Kenneth Albanowski <[email protected]>\n" ); -pr_info ("68328/Pilot support Bernhard Kuhn <[email protected]>\n" ); + mach_sched_init = hw_timer_init; + mach_hwclk = m68328_hwclk; + mach_reset = m68328_reset; - mach_hwclk = m68328_hwclk; - mach_reset = m68328_reset; +#if defined(CONFIG_PILOT ) && defined(CONFIG_M68328 ) + mach_sched_init =NULL ; +#elif defined(CONFIG_UCSIMM ) +init_ucsimm (command, len); +#elif defined(CONFIG_UCDIMM ) +init_ucsimm (command, len); +#elif defined(CONFIG_DRAGEN2 ) +init_dragen2 (command, len); +#endif }/***************************************************************************/
arch/m68k/68000/m68EZ328.c deleted +0 -58
58 lines not on this page · raw message
arch/m68k/68000/m68VZ328.c deleted +0 -67
67 lines not on this page · raw message
arch/m68k/Kconfig.cpu +4 -4
@@ -35,7 +35,7 @@ endchoice if M68KCLASSIC config M68000 - bool "MC68000" + bool depends on !MMU select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_MULDIV64
@@ -102,21 +102,21 @@ config M68060 processor, say Y. Otherwise, say N. config M68328 - bool "MC68328" + bool depends on !MMU select M68000 help Motorola 68328 processor support. config M68EZ328 - bool "MC68EZ328" + bool depends on !MMU select M68000 help Motorola 68EX328 processor support. config M68VZ328 - bool "MC68VZ328" + bool depends on !MMU select M68000 help
arch/m68k/Kconfig.machine +10 -6
@@ -136,14 +136,13 @@ config SUN3 If you don't want to compile a kernel exclusively for a Sun 3, say N. -endif # M68KCLASSIC - config PILOT bool config PILOT3 bool "Pilot 1000/5000, PalmPilot Personal/Pro, or PalmIII support" - depends on M68328 + depends on !MMU + select M68328 select PILOT help Support for the Palm Pilot 1000/5000, Personal/Pro and PalmIII.
@@ -156,19 +155,22 @@ config XCOPILOT_BUGS config UCSIMM bool "uCsimm module support" - depends on M68EZ328 + depends on !MMU + select M68EZ328 help Support for the Arcturus Networks uCsimm module. config UCDIMM bool "uDsimm module support" - depends on M68VZ328 + depends on !MMU + select M68VZ328 help Support for the Arcturus Networks uDsimm module. config DRAGEN2 bool "DragenEngine II board support" - depends on M68VZ328 + depends on !MMU + select M68VZ328 help Support for the DragenEngine II board.
@@ -191,6 +193,8 @@ config MEMORY_RESERVE help Reserve certain memory regions on 68x328 based boards. +endif # M68KCLASSIC + config ARN5206 bool "Arnewsh 5206 board support" depends on M5206
arch/m68k/kernel/setup_no.c +9 -0
@@ -106,8 +106,16 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_UCDIMM pr_info ("uCdimm by Lineo, Inc. <www.lineo.com>\n" );#endif +#ifdef CONFIG_M68328 +pr_info ("68328 support D. Jeff Dionne <[email protected]>\n" ); +pr_info ("68328 support Kenneth Albanowski <[email protected]>\n" ); +#endif +#ifdef CONFIG_M68EZ328 +pr_info ("68EZ328 DragonBallEZ support (C) 1999 Rt-Control, Inc\n" ); +#endif #ifdef CONFIG_M68VZ328 pr_info ("M68VZ328 support by Evan Stawnyczy <[email protected]>\n" ); +pr_info ("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n" );#endif #ifdef CONFIG_COLDFIRE pr_info ("COLDFIRE port done by Greg Ungerer, [email protected]\n" );
@@ -121,6 +129,7 @@ void __init setup_arch(char **cmdline_p)pr_info ("Flat model support (C) 1998,1999 Kenneth Albanowski, D. Jeff Dionne\n" );#if defined(CONFIG_PILOT ) && defined(CONFIG_M68328 ) +pr_info ("68328/Pilot support Bernhard Kuhn <[email protected]>\n" );pr_info ("TRG SuperPilot FLASH card support <[email protected]>\n" );#endif #if defined(CONFIG_PILOT ) && defined(CONFIG_M68EZ328 )
Signature · 1 line
2.27.0
Greg Ungerer
maintainerRe: [PATCH 2/2] m68k: m68328: remove duplicate code
Hi Arnd,
Overall looks good.
On 15/10/20 10:32 pm, Arnd Bergmann wrote:
[snip]
Quoted 46 lines
arch/m68k/Kconfig.cpu +4
-4@@ -35,7 +35,7 @@ endchoice if M68KCLASSIC config M68000 - bool "MC68000" + bool depends on !MMU select CPU_HAS_NO_BITFIELDS select CPU_HAS_NO_MULDIV64@@ -102,21 +102,21 @@ config M68060 processor, say Y. Otherwise, say N. config M68328 - bool "MC68328" + bool depends on !MMU select M68000 help Motorola 68328 processor support. config M68EZ328 - bool "MC68EZ328" + bool depends on !MMU select M68000 help Motorola 68EX328 processor support. config M68VZ328 - bool "MC68VZ328" + bool depends on !MMU select M68000 helparch/m68k/Kconfig.machine +0
-0@@ -136,14 +136,13 @@ config SUN3 If you don't want to compile a kernel exclusively for a Sun 3, say N.
arch/m68k/Kconfig.machine config SUN3 · line 145
Quoted 10 lines
arch/m68k/Kconfig.machine +2
-3-endif # M68KCLASSIC - config PILOT bool config PILOT3 bool "Pilot 1000/5000, PalmPilot Personal/Pro, or PalmIII support" - depends on M68328 + depends on !MMU + select M68328
Given that M68328 depends on !MMU do you also need or want that here?
Regards
Greg
A message that is not in the archive (sent off-list or not yet received): CAK8P3a2X3R1Rg3=FFaPQd4MHNJgBMDoVwcq+Fk8fNPoA42tTJQ@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAK8P3a3POARBq+6HxRyqPb3Vs93pTnmAm8ecMN2PpbQtgU4VCA@mail.gmail.com
Greg Ungerer
maintainerRe: [PATCH 2/2] m68k: m68328: remove duplicate code
Hi Arnd,
Quoted 31 lines · Arnd Bergmann
Quoted 25 lines · Arnd Bergmann
Quoted 15 lines · Greg Ungerer
Quoted 13 lines · Arnd Bergmann
arch/m68k/Kconfig.machine +0
-2@@ -136,14 +136,13 @@ config SUN3 If you don't want to compile a kernel exclusively for a Sun 3, say N. -endif # M68KCLASSIC - config PILOT boolQuoted 7 lines
arch/m68k/Kconfig.machine config SUN3 · line 145
Quoted 5 lines
arch/m68k/Kconfig.machine +2
-1config PILOT3 bool "Pilot 1000/5000, PalmPilot Personal/Pro, or PalmIII support" - depends on M68328 + depends on !MMU + select M68328Given that M68328 depends on !MMU do you also need or want that here?
Quoted 4 lines
Yes, that is exactly the reason: if M68328 depends on !MMU and gets selected by something that lacks the !MMU dependency, we'd get a
Kconfigwarning and a failed build when enabling PILOT3 with MMU enabled.
Quoted 4 lines
It looks like my reply never made it out because of mail server issues. I hope the above answers your question.
I'm rebasing this series (along with some others) now, and will resend in a bit.
Ok, no worries.
Otherwise looked good.
I will review v2 and most likely push into the m68knommu git tree.
Regards
Greg