Commit 8552d28e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:

 - cleanup of 68328 code

 - align BSS section to 32bit

* tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: m68328: remove duplicate code
  m68k: m68328: move platform code to separate files
  m68knommu: align BSS section to 4-byte boundaries
parents 70990afa 8b22820e

arch/m68k/68000/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -10,10 +10,11 @@ 


# 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

obj-$(CONFIG_UCSIMM)	+= ucsimm.o

obj-$(CONFIG_UCDIMM)	+= ucsimm.o



extra-y 		:= head.o

arch/m68k/68000/m68VZ328.c→arch/m68k/68000/dragen2.c

+100 −0
Original line number Diff line number Diff line 
/***************************************************************************/



// SPDX-License-Identifier: GPL-2.0

/*

 *  m68VZ328.c - 68VZ328 specific config

 *

 *  Copyright (C) 1993 Hamish Macdonald

 *  Copyright (C) 1999 D. Jeff Dionne

 *  Copyright (C) 2001 Georges Menie, Ken Desmet
@@ -11,37 +8,15 @@ 
 * 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



/***************************************************************************/



int m68328_hwclk(int set, struct rtc_time *t);



/***************************************************************************/

/*                        Init Drangon Engine hardware                     */

/***************************************************************************/

#if defined(CONFIG_DRAGEN2)



static void m68vz328_reset(void)

static void dragen2_reset(void)

{

	local_irq_disable();
@@ -60,8 +35,10 @@ static void m68vz328_reset(void) 
	);

}



static void __init init_hardware(char *command, int size)

void __init init_dragen2(char *command, int size)

{

	mach_reset = dragen2_reset;



#ifdef CONFIG_DIRECT_IO_ACCESS

	SCR = 0x10;					/* allow user access to internal registers */

#endif
@@ -121,69 +98,3 @@ static void __init init_hardware(char *command, int size) 
	PWMR = 0x037F;

#endif

}
 


/***************************************************************************/

/*                      Init RT-Control uCdimm hardware                    */

/***************************************************************************/

#elif defined(CONFIG_UCDIMM)



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"

	);

}



unsigned char *cs8900a_hwaddr;

static int errno;



_bsc0(char *, getserialnum)

_bsc1(unsigned char *, gethwaddr, int, a)

_bsc1(char *, getbenv, char *, a)



static void __init init_hardware(char *command, int size)

{

	char *p;



	pr_info("uCdimm serial string [%s]\n", getserialnum());

	p = cs8900a_hwaddr = gethwaddr(0);

	pr_info("uCdimm hwaddr %pM\n", p);

	p = getbenv("APPEND");

	if (p)

		strcpy(p, command);

	else

		command[0] = 0;

}



/***************************************************************************/

#else



static void m68vz328_reset(void)

{

}



static void __init init_hardware(char *command, int size)

{

}



/***************************************************************************/

#endif

/***************************************************************************/



void __init config_BSP(char *command, int size)

{

	pr_info("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");



	init_hardware(command, size);



	mach_sched_init = hw_timer_init;

	mach_hwclk = m68328_hwclk;

	mach_reset = m68vz328_reset;

}



/***************************************************************************/

arch/m68k/68000/m68328.c

+20 −12
Original line number Diff line number Diff line 
/***************************************************************************/



/*

 *  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,18 +21,18 @@ 
#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



/***************************************************************************/



int m68328_hwclk(int set, struct rtc_time *t);

#include "m68328.h"



/***************************************************************************/



void m68328_reset (void)

static void m68328_reset(void)

{

  local_irq_disable();

  asm volatile ("moveal #0x10c00000, %a0;\n\t"
@@ -45,12 +46,19 @@ void m68328_reset (void) 


void __init config_BSP(char *command, int len)

{

  pr_info("68328 support D. Jeff Dionne <jeff@uclinux.org>\n");

  pr_info("68328 support Kenneth Albanowski <kjahds@kjshds.com>\n");

  pr_info("68328/Pilot support Bernhard Kuhn <kuhn@lpr.e-technik.tu-muenchen.de>\n");



	mach_sched_init = hw_timer_init;

	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/m68328.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
// 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

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
/***************************************************************************/



/*

 *  m68EZ328.c - 68EZ328 specific config

 *

 *  Copyright (C) 1993 Hamish Macdonald

 *  Copyright (C) 1999 D. Jeff Dionne

 *

 * 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/rtc.h>

#include <linux/pgtable.h>

#include <asm/machdep.h>

#include <asm/MC68EZ328.h>

#ifdef CONFIG_UCSIMM

#include <asm/bootstd.h>

#endif



/***************************************************************************/



int m68328_hwclk(int set, struct rtc_time *t);



/***************************************************************************/



void m68ez328_reset(void)

{

  local_irq_disable();

  asm volatile (

    "moveal #0x10c00000, %a0;\n"

    "moveb #0, 0xFFFFF300;\n"

    "moveal 0(%a0), %sp;\n"

    "moveal 4(%a0), %a0;\n"

    "jmp (%a0);\n"

    );

}



/***************************************************************************/



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;

#endif



  mach_sched_init = hw_timer_init;

  mach_hwclk = m68328_hwclk;

  mach_reset = m68ez328_reset;

}



/***************************************************************************/