Date: Mon, 21 May 2012 15:04:32 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r236063 - in soc2012/aleek/beaglexm-armv6: lib/libc lib/libc/arm/gen sys sys/arm/conf Message-ID: <20120521150432.2C1AC106566B@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: aleek Date: Mon May 21 15:04:31 2012 New Revision: 236063 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236063 Log: testing - come merges from armv6 tree and 2 config files for bb-xm Added: soc2012/aleek/beaglexm-armv6/sys/arm/conf/EA3250.hints - copied unchanged from r235800, mirror/FreeBSD/projects/armv6/sys/arm/conf/EA3250.hints Modified: soc2012/aleek/beaglexm-armv6/lib/libc/ (props changed) soc2012/aleek/beaglexm-armv6/lib/libc/arm/gen/__aeabi_read_tp.S soc2012/aleek/beaglexm-armv6/lib/libc/arm/gen/_set_tp.c soc2012/aleek/beaglexm-armv6/sys/ (props changed) Modified: soc2012/aleek/beaglexm-armv6/lib/libc/arm/gen/__aeabi_read_tp.S ============================================================================== --- soc2012/aleek/beaglexm-armv6/lib/libc/arm/gen/__aeabi_read_tp.S Mon May 21 14:47:34 2012 (r236062) +++ soc2012/aleek/beaglexm-armv6/lib/libc/arm/gen/__aeabi_read_tp.S Mon May 21 15:04:31 2012 (r236063) @@ -31,8 +31,12 @@ #include <machine/sysarch.h> ENTRY(__aeabi_read_tp) +#ifdef ARM_TP_ADDRESS ldr r0, .Larm_tp_address ldr r0, [r0] +#else + mrc p15, 0, r0, c13, c0, 3 +#endif RET .Larm_tp_address: Modified: soc2012/aleek/beaglexm-armv6/lib/libc/arm/gen/_set_tp.c ============================================================================== --- soc2012/aleek/beaglexm-armv6/lib/libc/arm/gen/_set_tp.c Mon May 21 14:47:34 2012 (r236062) +++ soc2012/aleek/beaglexm-armv6/lib/libc/arm/gen/_set_tp.c Mon May 21 15:04:31 2012 (r236063) @@ -35,5 +35,9 @@ _set_tp(void *tp) { +#ifdef ARM_TP_ADDRESS *((struct tcb **)ARM_TP_ADDRESS) = tp; +#else + sysarch(ARM_SET_TP, tp); +#endif } Copied: soc2012/aleek/beaglexm-armv6/sys/arm/conf/EA3250.hints (from r235800, mirror/FreeBSD/projects/armv6/sys/arm/conf/EA3250.hints) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/aleek/beaglexm-armv6/sys/arm/conf/EA3250.hints Mon May 21 15:04:31 2012 (r236063, copy of r235800, mirror/FreeBSD/projects/armv6/sys/arm/conf/EA3250.hints) @@ -0,0 +1,2 @@ +hint.ssd1289.0.at="spibus0" +hint.ssd1289.0.cs=26
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120521150432.2C1AC106566B>