From c5b094252c4014f9e2cb8ab1a897960901b68dc2 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 27 Jun 2006 13:27:02 +1000 Subject: [PATCH] --- yaml --- r: 30867 b: refs/heads/master c: 01f7e67367f75257ea5e8e5a21eddba9fa660f17 h: refs/heads/master i: 30865: 294201dc431cd0a6a7252b36168fa6faa121c8c4 30863: 299500be2a6ccd7b5ece81c6d6fc1f4ef871111a v: v3 --- [refs] | 2 +- trunk/arch/m68knommu/platform/68328/head-rom.S | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b33c20e0cd0f..59dea6ba5f21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5c7726ffc994f1826415852e7196bcb6c664d44 +refs/heads/master: 01f7e67367f75257ea5e8e5a21eddba9fa660f17 diff --git a/trunk/arch/m68knommu/platform/68328/head-rom.S b/trunk/arch/m68knommu/platform/68328/head-rom.S index 2b448a297011..234430b9551c 100644 --- a/trunk/arch/m68knommu/platform/68328/head-rom.S +++ b/trunk/arch/m68knommu/platform/68328/head-rom.S @@ -28,6 +28,8 @@ _ramstart: _ramend: .long 0 +#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE) + #ifdef CONFIG_INIT_LCD splash_bits: #include "bootlogo.rh" @@ -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 @@ -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