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>
110 lines
1.9 KiB
ArmAsm
110 lines
1.9 KiB
ArmAsm
|
|
.global _start
|
|
.global _stext
|
|
|
|
.global _rambase
|
|
.global _ramvec
|
|
.global _ramstart
|
|
.global _ramend
|
|
|
|
#ifdef CONFIG_INIT_LCD
|
|
.global splash_bits
|
|
#endif
|
|
|
|
.data
|
|
|
|
/*
|
|
* Set up the usable of RAM stuff. Size of RAM is determined then
|
|
* an initial stack set up at the end.
|
|
*/
|
|
.align 4
|
|
_ramvec:
|
|
.long 0
|
|
_rambase:
|
|
.long 0
|
|
_ramstart:
|
|
.long 0
|
|
_ramend:
|
|
.long 0
|
|
|
|
#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE)
|
|
|
|
#ifdef CONFIG_INIT_LCD
|
|
splash_bits:
|
|
#include "bootlogo.rh"
|
|
#endif
|
|
|
|
.text
|
|
_start:
|
|
_stext: movew #0x2700,%sr
|
|
#ifdef CONFIG_INIT_LCD
|
|
movel #splash_bits, 0xfffffA00 /* LSSA */
|
|
moveb #0x28, 0xfffffA05 /* LVPW */
|
|
movew #0x280, 0xFFFFFa08 /* LXMAX */
|
|
movew #0x1df, 0xFFFFFa0a /* LYMAX */
|
|
moveb #0, 0xfffffa29 /* LBAR */
|
|
moveb #0, 0xfffffa25 /* LPXCD */
|
|
moveb #0x08, 0xFFFFFa20 /* LPICF */
|
|
moveb #0x01, 0xFFFFFA21 /* -ve pol */
|
|
moveb #0x81, 0xfffffA27 /* LCKCON */
|
|
movew #0xff00, 0xfffff412 /* LCD pins */
|
|
#endif
|
|
moveal #RAMEND-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp
|
|
movew #32767, %d0 /* PLL settle wait loop */
|
|
1: subq #1, %d0
|
|
bne 1b
|
|
|
|
/* Copy data segment from ROM to RAM */
|
|
moveal #_etext, %a0
|
|
moveal #_sdata, %a1
|
|
moveal #_edata, %a2
|
|
|
|
/* Copy %a0 to %a1 until %a1 == %a2 */
|
|
1: movel %a0@+, %a1@+
|
|
cmpal %a1, %a2
|
|
bhi 1b
|
|
|
|
moveal #_sbss, %a0
|
|
moveal #_ebss, %a1
|
|
/* Copy 0 to %a0 until %a0 == %a1 */
|
|
|
|
1:
|
|
clrl %a0@+
|
|
cmpal %a0, %a1
|
|
bhi 1b
|
|
|
|
movel #_sdata, %d0
|
|
movel %d0, _rambase
|
|
movel #_ebss, %d0
|
|
movel %d0, _ramstart
|
|
movel #RAMEND-CONFIG_MEMORY_RESERVE*0x100000, %d0
|
|
movel %d0, _ramend
|
|
movel #CONFIG_VECTORBASE, %d0
|
|
movel %d0, _ramvec
|
|
|
|
/*
|
|
* load the current task pointer and stack
|
|
*/
|
|
lea init_thread_union, %a0
|
|
lea 0x2000(%a0), %sp
|
|
|
|
1: jsr start_kernel
|
|
bra 1b
|
|
_exit:
|
|
|
|
jmp _exit
|
|
|
|
|
|
putc:
|
|
moveb %d7,0xfffff907
|
|
1:
|
|
movew 0xfffff906, %d7
|
|
andw #0x2000, %d7
|
|
beq 1b
|
|
rts
|
|
|
|
.data
|
|
env:
|
|
.long 0
|
|
.text
|
|
|