diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-18 22:15:58 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-18 22:15:58 +0100 |
| commit | fdeb932b1c8a3b615463995c3452d30ee0b12a33 (patch) | |
| tree | e753cbcf649c67445b8c0359d9656fea26a84a4b /lib_blackfin | |
| parent | 3515fd18d4e8e44f863ac7142b55e22b109e9af2 (diff) | |
| parent | 1f2a9970109cebf7446e0503b10b71f8673045ee (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Diffstat (limited to 'lib_blackfin')
| -rw-r--r-- | lib_blackfin/board.c | 3 | ||||
| -rw-r--r-- | lib_blackfin/memcmp.S | 3 | ||||
| -rw-r--r-- | lib_blackfin/memcpy.S | 3 | ||||
| -rw-r--r-- | lib_blackfin/memmove.S | 3 | ||||
| -rw-r--r-- | lib_blackfin/memset.S | 3 |
5 files changed, 14 insertions, 1 deletions
diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index 86a3b67c98..2a5a2fce45 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -116,6 +116,7 @@ static int display_banner(void) { sprintf(version_string, VERSION_STRING_FORMAT, VERSION_STRING); printf("%s\n", version_string); + printf("CPU: ADSP " MK_STR(CONFIG_BFIN_CPU) " (Detected Rev: 0.%d)\n", bfin_revid()); return (0); } @@ -404,7 +405,7 @@ void board_init_r(gd_t * id, ulong dest_addr) misc_init_r(); #endif -#if ((BFIN_CPU == ADSP_BF537) || (BFIN_CPU == ADSP_BF536)) +#ifdef CONFIG_CMD_NET printf("Net: "); eth_initialize(bd); #endif diff --git a/lib_blackfin/memcmp.S b/lib_blackfin/memcmp.S index 9b58832943..6c834a7e85 100644 --- a/lib_blackfin/memcmp.S +++ b/lib_blackfin/memcmp.S @@ -31,6 +31,7 @@ */ .globl _memcmp; +.type _memcmp, STT_FUNC; _memcmp: I1 = P3; P0 = R0; /* P0 = s1 address */ @@ -98,3 +99,5 @@ _memcmp: R0 = 0; P3 = I1; RTS; + +.size _memcmp, .-_memcmp diff --git a/lib_blackfin/memcpy.S b/lib_blackfin/memcpy.S index 24577bebdc..e6b359a344 100644 --- a/lib_blackfin/memcpy.S +++ b/lib_blackfin/memcpy.S @@ -23,6 +23,7 @@ .align 2 .globl _memcpy_ASM; +.type _memcpy_ASM, STT_FUNC; _memcpy_ASM: CC = R2 <= 0; /* length not positive?*/ IF CC JUMP .L_P1L2147483647; /* Nothing to do */ @@ -112,3 +113,5 @@ _memcpy_ASM: B[P0--] = R1; RTS; + +.size _memcpy_ASM, .-_memcpy_ASM diff --git a/lib_blackfin/memmove.S b/lib_blackfin/memmove.S index 46f79ed18d..e385c4f6f5 100644 --- a/lib_blackfin/memmove.S +++ b/lib_blackfin/memmove.S @@ -31,6 +31,7 @@ */ .globl _memmove; +.type _memmove, STT_FUNC; _memmove: I1 = P3; P0 = R0; /* P0 = To address */ @@ -91,3 +92,5 @@ _memmove: .Lno_loop: B[P0] = R1; P3 = I1; RTS; + +.size _memmove, .-_memmove diff --git a/lib_blackfin/memset.S b/lib_blackfin/memset.S index c33c551121..26f63cdc94 100644 --- a/lib_blackfin/memset.S +++ b/lib_blackfin/memset.S @@ -31,6 +31,7 @@ */ .globl _memset; +.type _memset, STT_FUNC; _memset: P0 = R0 ; /* P0 = address */ P2 = R2 ; /* P2 = count */ @@ -91,3 +92,5 @@ _memset: B[P0++] = R1; B[P0++] = R1; JUMP .Laligned; + +.size _memset, .-_memset |