Skip to content

Commit

Permalink
[PATCH] m68knommu: use Kconfig RAM config options in 68360 RAM startu…
Browse files Browse the repository at this point in the history
…p code

Switch to using the new RAM Kconfig settings, instead of linker defined
regions in RAM specific 68360 startup code.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Jun 28, 2006
1 parent 999567d commit d046f61
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions arch/m68knommu/platform/68360/head-ram.S
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
.global _start

.global _rambase
.global __ramvec
.global _ramvec
.global _ramstart
.global _ramend

.global _quicc_base
.global _periph_base

#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE)

#define REGB 0x1000
#define PEPAR (_dprbase + REGB + 0x0016)
#define GMR (_dprbase + REGB + 0x0040)
Expand Down Expand Up @@ -103,7 +104,7 @@ _stext:
nop
ori.w #MCU_DISABLE_INTRPTS, %sr /* disable interrupts: */
/* We should not need to setup the boot stack the reset should do it. */
movea.l #__ramend, %sp /*set up stack at the end of DRAM:*/
movea.l #RAMEND, %sp /*set up stack at the end of DRAM:*/

set_mbar_register:
moveq.l #0x07, %d1 /* Setup MBAR */
Expand Down Expand Up @@ -163,7 +164,7 @@ configure_memory_controller:
move.l %d0, GMR

configure_chip_select_0:
move.l #__ramend, %d0
move.l #RAMEND, %d0
subi.l #__ramstart, %d0
subq.l #0x01, %d0
eori.l #SIM_OR_MASK, %d0
Expand Down Expand Up @@ -234,16 +235,10 @@ store_ram_size:
/* Set ram size information */
move.l #_sdata, _rambase
move.l #_ebss, _ramstart
move.l #__ramend, %d0
move.l #RAMEND, %d0
sub.l #0x1000, %d0 /* Reserve 4K for stack space.*/
move.l %d0, _ramend /* Different from __ramend.*/
move.l %d0, _ramend /* Different from RAMEND.*/

store_flash_size:
/* Set rom size information */
move.l #__rom_end, %d0
sub.l #__rom_start, %d0
move.l %d0, rom_length

pea 0
pea env
pea %sp@(4)
Expand Down Expand Up @@ -286,7 +281,7 @@ _dprbase:
*/

.section ".data.initvect","awx"
.long __ramend /* Reset: Initial Stack Pointer - 0. */
.long RAMEND /* Reset: Initial Stack Pointer - 0. */
.long _start /* Reset: Initial Program Counter - 1. */
.long buserr /* Bus Error - 2. */
.long trap /* Address Error - 3. */
Expand Down

0 comments on commit d046f61

Please sign in to comment.