Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm/bcm53xx After loading the pc-relative offset...



details:   https://anonhg.NetBSD.org/src/rev/16da1ae3930e
branches:  trunk
changeset: 326273:16da1ae3930e
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jan 24 04:15:33 2014 +0000

description:
After loading the pc-relative offset, clear the upper the 4 bits incase
.start starts at a different address than .text (bcm56340).

diffstat:

 sys/arch/evbarm/bcm53xx/bcm53xx_start.S |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 1c1e841c5d4a -r 16da1ae3930e sys/arch/evbarm/bcm53xx/bcm53xx_start.S
--- a/sys/arch/evbarm/bcm53xx/bcm53xx_start.S   Fri Jan 24 02:06:03 2014 +0000
+++ b/sys/arch/evbarm/bcm53xx/bcm53xx_start.S   Fri Jan 24 04:15:33 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm53xx_start.S,v 1.9 2013/12/24 21:59:59 matt Exp $   */
+/*     $NetBSD: bcm53xx_start.S,v 1.10 2014/01/24 04:15:33 matt Exp $  */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -45,7 +45,7 @@
 #define        CONADDR         0x18000300
 #endif
 
-RCSID("$NetBSD: bcm53xx_start.S,v 1.9 2013/12/24 21:59:59 matt Exp $")
+RCSID("$NetBSD: bcm53xx_start.S,v 1.10 2014/01/24 04:15:33 matt Exp $")
 
 #undef VERBOSE_INIT_ARM
 #define VERBOSE_INIT_ARM
@@ -76,6 +76,7 @@
         */
        movw    r4, #:lower16:(uboot_args-.LPIC0)
        movt    r4, #:upper16:(uboot_args-.LPIC0)
+       bic     r4, r4, #0xf0000000
        add     r4, r4, pc
        stmia   r4, {r0-r3}
 .LPIC0:



Home | Main Index | Thread Index | Old Index