Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30867
b: refs/heads/master
c: 01f7e67
h: refs/heads/master
i:
  30865: 294201d
  30863: 299500b
v: v3
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Jun 28, 2006
1 parent 3dd766d commit c5b0942
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f5c7726ffc994f1826415852e7196bcb6c664d44
refs/heads/master: 01f7e67367f75257ea5e8e5a21eddba9fa660f17
18 changes: 10 additions & 8 deletions trunk/arch/m68knommu/platform/68328/head-rom.S
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ _ramstart:
_ramend:
.long 0

#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE)

#ifdef CONFIG_INIT_LCD
splash_bits:
#include "bootlogo.rh"
Expand All @@ -48,7 +50,7 @@ _stext: movew #0x2700,%sr
moveb #0x81, 0xfffffA27 /* LCKCON */
movew #0xff00, 0xfffff412 /* LCD pins */
#endif
moveal #__ramend-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp
moveal #RAMEND-CONFIG_MEMORY_RESERVE*0x100000 - 0x10, %sp
movew #32767, %d0 /* PLL settle wait loop */
1: subq #1, %d0
bne 1b
Expand All @@ -73,13 +75,13 @@ _stext: movew #0x2700,%sr
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 #__ramvec, %d0
movel %d0, _ramvec
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
Expand Down

0 comments on commit c5b0942

Please sign in to comment.