minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

mpc83xx: Put the version (and magic) after the HRCW.

Browse Source 
Put the version (and magic) after the HRCW.  This puts it in a fixed
location in flash, not at the start of flash but as close as we can get.

Signed-off-by: Jerry Van Baren <vanbaren@cideas.com>
This commit is contained in:
Jerry Van Baren 2006-12-06 21:23:55 -05:00 committed by Kim Phillips
parent 48aecd9691
commit f35f358241
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cpu/mpc83xx/start.S
View File

@ -77,19 +77,11 @@
END_GOT END_GOT
/* /*
* Version string - must be in data segment because MPC83xx uses the * The Hard Reset Configuration Word (HRCW) table is in the first 64
* first 256 bytes for the Hard Reset Configuration Word table (see * (0x40) bytes of flash. It has 8 bytes, but each byte is repeated 8
* below). Similarly, can't have the U-Boot Magic Number as the first * times so the processor can fetch it out of flash whether the flash
* thing in the image - don't know how this will affect the image tools, * is 8, 16, 32, or 64 bits wide (hardware trickery).
* but I guess I'll find out soon.
*/ */
.data
.globl version_string
version_string:
.ascii U_BOOT_VERSION
.ascii " (", __DATE__, " - ", __TIME__, ")"
.ascii " ", CONFIG_IDENT_STRING, "\0"
.text .text
#define _HRCW_TABLE_ENTRY(w) \ #define _HRCW_TABLE_ENTRY(w) \
.fill 8,1,(((w)>>24)&0xff); \ .fill 8,1,(((w)>>24)&0xff); \
@ -100,6 +92,18 @@ version_string:
_HRCW_TABLE_ENTRY(CFG_HRCW_LOW) _HRCW_TABLE_ENTRY(CFG_HRCW_LOW)
_HRCW_TABLE_ENTRY(CFG_HRCW_HIGH) _HRCW_TABLE_ENTRY(CFG_HRCW_HIGH)
/*
* Magic number and version string - put it after the HRCW since it
* cannot be first in flash like it is in many other processors.
*/
.long 0x27051956 /* U-Boot Magic Number */
.globl version_string
version_string:
.ascii U_BOOT_VERSION
.ascii " (", __DATE__, " - ", __TIME__, ")"
.ascii " ", CONFIG_IDENT_STRING, "\0"
#ifndef CONFIG_DEFAULT_IMMR #ifndef CONFIG_DEFAULT_IMMR
#error CONFIG_DEFAULT_IMMR must be defined #error CONFIG_DEFAULT_IMMR must be defined