Module Name: src
Committed By: matt
Date: Fri Jan 24 04:15:33 UTC 2014
Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_start.S
Log Message:
After loading the pc-relative offset, clear the upper the 4 bits incase
.start starts at a different address than .text (bcm56340).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.9 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.10
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.9 Tue Dec 24 21:59:59 2013
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S Fri Jan 24 04:15:33 2014
@@ -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 @@ _C_LABEL(bcm53xx_start):
*/
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:
