mirror of
https://github.com/torvalds/linux
synced 2024-10-25 20:59:03 +00:00
66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
77 lines
2 KiB
C
77 lines
2 KiB
C
/***************************************************************************/
|
|
|
|
/*
|
|
* linux/arch/m68knommu/platform/68EZ328/config.c
|
|
*
|
|
* 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/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <asm/system.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/machdep.h>
|
|
#include <asm/MC68EZ328.h>
|
|
#ifdef CONFIG_UCSIMM
|
|
#include <asm/bootstd.h>
|
|
#endif
|
|
|
|
/***************************************************************************/
|
|
|
|
void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
|
|
|
|
/***************************************************************************/
|
|
|
|
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 config_BSP(char *command, int len)
|
|
{
|
|
unsigned char *p;
|
|
|
|
printk(KERN_INFO "\n68EZ328 DragonBallEZ support (C) 1999 Rt-Control, Inc\n");
|
|
|
|
#ifdef CONFIG_UCSIMM
|
|
printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum());
|
|
p = cs8900a_hwaddr = gethwaddr(0);
|
|
printk(KERN_INFO "uCsimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
|
|
p[0], p[1], p[2], p[3], p[4], p[5]);
|
|
|
|
p = getbenv("APPEND");
|
|
if (p) strcpy(p,command);
|
|
else command[0] = 0;
|
|
#endif
|
|
|
|
mach_gettod = m68328_timer_gettod;
|
|
mach_reset = m68ez328_reset;
|
|
}
|
|
|
|
/***************************************************************************/
|