diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-10-30 17:26:24 +0300 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2020-12-07 02:37:58 +0300 |
| commit | 8b22820efb35f93d98638563b0a8f4094e8ee399 (patch) | |
| tree | c77b510fff317ef77913d4fad7def80654b9abaf /arch/m68k/68000/m68VZ328.c | |
| parent | a734bbf694270dca8594a5c33375867dc31503f5 (diff) | |
| download | linux-8b22820efb35f93d98638563b0a8f4094e8ee399.tar.xz | |
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.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k/68000/m68VZ328.c')
| -rw-r--r-- | arch/m68k/68000/m68VZ328.c | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/arch/m68k/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c deleted file mode 100644 index 025da5552f1c..000000000000 --- a/arch/m68k/68000/m68VZ328.c +++ /dev/null @@ -1,67 +0,0 @@ -/***************************************************************************/ - -/* - * m68VZ328.c - 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 - * for more details. - */ - -/***************************************************************************/ - -#include <linux/init.h> -#include <linux/types.h> -#include <linux/kernel.h> -#include <linux/kd.h> -#include <linux/netdevice.h> -#include <linux/interrupt.h> -#include <linux/irq.h> -#include <linux/rtc.h> -#include <linux/pgtable.h> - -#include <asm/machdep.h> -#include <asm/MC68VZ328.h> -#include <asm/bootstd.h> - -#ifdef CONFIG_INIT_LCD -#include "bootlogo-vz.h" -#endif - -#include "m68328.h" - -/***************************************************************************/ -static void m68vz328_reset(void) -{ - local_irq_disable(); - asm volatile ( - "moveal #0x10c00000, %a0;\n\t" - "moveb #0, 0xFFFFF300;\n\t" - "moveal 0(%a0), %sp;\n\t" - "moveal 4(%a0), %a0;\n\t" - "jmp (%a0);\n" - ); -} - -/***************************************************************************/ - -void __init config_BSP(char *command, int size) -{ - pr_info("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n"); - - mach_sched_init = hw_timer_init; - mach_hwclk = m68328_hwclk; - mach_reset = m68vz328_reset; - -#ifdef CONFIG_UCDIMM - init_ucsimm(command, len); -#elif defined(CONFIG_DRAGEN2) - init_dragen2(command, len); -#endif -} - -/***************************************************************************/ |