Skip to content
Snippets Groups Projects
Commit 6f5155a9 authored by Marian Balakowicz's avatar Marian Balakowicz
Browse files

Make R5200 specific low level initialization board conditional.

parent b75ef85f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CHANGELOG
+ 2
− 0
View file @ 6f5155a9
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Make R5200 specific low level initialization board conditional.
* Update CPU target identification strings for Coldfire family. * Update CPU target identification strings for Coldfire family.
* Update register definitions for MCF5271. * Update register definitions for MCF5271.
......
cpu/mcf52x2/start.S
+ 15
− 9
View file @ 6f5155a9
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
*/ */
_vectors: _vectors:
#ifndef CONFIG_M5271 #ifndef CONFIG_R5200
.long 0x00000000, _START .long 0x00000000, _START
#else #else
.long 0x00000000, 0x400 /* Flash offset is 0 until we setup CS0 */ .long 0x00000000, 0x400 /* Flash offset is 0 until we setup CS0 */
...@@ -142,7 +142,9 @@ _start: ...@@ -142,7 +142,9 @@ _start:
/* Initialize RAMBAR1: locate SRAM and validate it */ /* Initialize RAMBAR1: locate SRAM and validate it */
move.l #(CFG_INIT_RAM_ADDR + 0x21), %d0 move.l #(CFG_INIT_RAM_ADDR + 0x21), %d0
movec %d0, %RAMBAR1 movec %d0, %RAMBAR1
#ifdef CONFIG_M5271 #endif
#ifdef CONFIG_R5200
move.l #(_flash_setup-CFG_FLASH_BASE), %a0 move.l #(_flash_setup-CFG_FLASH_BASE), %a0
move.l #(_flash_setup_end-CFG_FLASH_BASE), %a1 move.l #(_flash_setup_end-CFG_FLASH_BASE), %a1
move.l #(CFG_INIT_RAM_ADDR), %a2 move.l #(CFG_INIT_RAM_ADDR), %a2
...@@ -150,8 +152,6 @@ _copy_flash: ...@@ -150,8 +152,6 @@ _copy_flash:
move.l (%a0)+, (%a2)+ move.l (%a0)+, (%a2)+
cmp.l %a0, %a1 cmp.l %a0, %a1
bgt.s _copy_flash bgt.s _copy_flash
#endif
jmp CFG_INIT_RAM_ADDR jmp CFG_INIT_RAM_ADDR
_after_flash_copy: _after_flash_copy:
#endif #endif
...@@ -174,18 +174,24 @@ _after_flash_copy: ...@@ -174,18 +174,24 @@ _after_flash_copy:
bsr cpu_init_f /* run low-level CPU init code (from flash) */ bsr cpu_init_f /* run low-level CPU init code (from flash) */
bsr board_init_f /* run low-level board init code (from flash) */ bsr board_init_f /* run low-level board init code (from flash) */
/* board_init_f() does not return /* board_init_f() does not return */
/*------------------------------------------------------------------------------*/ /*------------------------------------------------------------------------------*/
#ifdef CONFIG_M5271 #ifdef CONFIG_R5200
_flash_setup: _flash_setup:
move.l #0x1000, %d0 /* CSAR0 */
move.l #((CFG_FLASH_BASE & 0xffff0000) >> 16), %d0
move.w %d0, 0x40000080 move.w %d0, 0x40000080
move.l #0x2180, %d0
/* CSCR0 */
move.l #0x2180, %d0 /* 8 wait states, 16bit port, auto ack, */
move.w %d0, 0x4000008A move.w %d0, 0x4000008A
move.l #0x3f0001, %d0
/* CSMR0 */
move.l #0x001f0001, %d0 /* 2 MB, valid */
move.l %d0, 0x40000084 move.l %d0, 0x40000084
jmp _after_flash_copy.L jmp _after_flash_copy.L
_flash_setup_end: _flash_setup_end:
#endif #endif
......
include/configs/r5200.h
+ 1
− 0
View file @ 6f5155a9
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
*/ */
#define CONFIG_MCF52x2 /* define processor family */ #define CONFIG_MCF52x2 /* define processor family */
#define CONFIG_M5271 /* define processor type */ #define CONFIG_M5271 /* define processor type */
#define CONFIG_R5200 /* define board type */
#define FEC_ENET #define FEC_ENET
#define CONFIG_NET_RETRY_COUNT 5 #define CONFIG_NET_RETRY_COUNT 5
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment