mirror of
https://github.com/torvalds/linux.git
synced 2024-11-02 10:11:36 +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>
36 lines
910 B
ArmAsm
36 lines
910 B
ArmAsm
/*
|
|
* linux/arch/m68knommu/platform/68328/romvec.S
|
|
*
|
|
* 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.
|
|
*
|
|
* Copyright 1996 Roman Zippel
|
|
* Copyright 1999 D. Jeff Dionne <jeff@rt-control.com>
|
|
* Copyright 2006 Greg Ungerer <gerg@snapgear.com>
|
|
*/
|
|
|
|
.global _start
|
|
.global _buserr
|
|
.global trap
|
|
.global system_call
|
|
|
|
.section .romvec
|
|
|
|
e_vectors:
|
|
.long CONFIG_RAMBASE+CONFIG_RAMSIZE-4, _start, buserr, trap
|
|
.long trap, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
/* TRAP #0-15 */
|
|
.long system_call, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
.long trap, trap, trap, trap
|
|
.long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
|
|