Date: Mon, 5 Nov 2012 08:07:10 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219597 for review Message-ID: <201211050807.qA587AMC087528@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@219597?ac=10 Change 219597 by peter@peter_overcee on 2012/11/05 08:06:49 IFC Affected files ... .. //depot/projects/hammer/sys/arm/conf/HL201.hints#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/debug.h#2 integrate Differences ... ==== //depot/projects/hammer/sys/arm/conf/HL201.hints#2 (text+ko) ==== @@ -1,68 +1,48 @@ -# $FreeBSD: src/sys/arm/conf/HL201.hints,v 1.1 2010/07/14 00:48:53 cognet Exp $ -# +# $FreeBSD: head/sys/arm/conf/HL201.hints 239323 2012-08-16 04:53:30Z imp $ -# These are the wiring for the at91sam9261. These are the built-in devices -# for that cpu. +# Atmel AT45DB21D +hint.at45d.0.at="spibus0" +hint.at45d.0.cs=0 +# Area 0: 00000000 to 000041FF (RO) Bootstrap +# Area 1: 00004200 to 000083FF Environment +# Area 2: 00008400 to 00041FFF (RO) U-Boot +# Area 3: 00042000 to 00251FFF Kernel +# Area 4: 00252000 to 0083FFFF FS +# bootstrap +hint.map.0.at="flash/spi0" +hint.map.0.start=0x00000000 +hint.map.0.end=0x000041ff +hint.map.0.name="bootstrap" +hint.map.0.readonly=1 +# uboot environment +hint.map.1.at="flash/spi0" +hint.map.1.start=0x00004200 +hint.map.1.end=0x00083ff +hint.map.1.name="uboot-env" +#hint.map.1.readonly=1 +# uboot +hint.map.2.at="flash/spi0" +hint.map.2.start=0x00008400 +hint.map.2.end=0x00041fff +hint.map.2.name="uboot" +hint.map.2.readonly=1 +# kernel +hint.map.3.at="flash/spi0" +hint.map.3.start=0x00042000 +hint.map.3.end=0x00251fff +hint.map.3.name="fs" +#hint.map.3.readonly=1 +# fs +hint.map.4.at="flash/spi0" +hint.map.4.start=0x00252000 +hint.map.4.end=0x0083ffff +hint.map.4.name="fs" +#hint.map.4.readonly=1 -# DBGU is unit 0 -hint.uart.0.at="apb" -hint.uart.0.maddr="0xfffff200" -hint.uart.0.flags=0x10 -# USART0 is unit 1 -hint.uart.1.at="apb" -hint.uart.1.maddr="0xfffb0000" -# USART1 is unit 2 -hint.uart.2.at="apb" -hint.uart.2.maddr="0xfffb4000" -# USART2 is unit 3 -hint.uart.3.at="apb" -hint.uart.3.maddr="0xfffb8000" -# USART3 is unit 4 -hint.uart.4.at="apb" -hint.uart.4.maddr="0xfffbc000" - -# TC0, TC1, TC2 -hint.tc.0.at="apb" -hint.tc.0.maddr="0xfffa0000" - -# USB Device -hint.udp.0.at="apb" -hint.udp.0.maddr="0xfffa4000" - -# MCI -hint.mci.0.at="apb" -hint.mci.0.maddr="0xfffa8000" - -# TWI -hint.twi.0.at="apb" -hint.twi.0.maddr="0xfffac000" - -# SSC0 -hint.ssc.0.at="apb" -hint.ssc.0.maddr="0xfffbc000" -# SSC1 -hint.ssc.1.at="apb" -hint.ssc.1.maddr="0xfffc0000" -# SSC2 -hint.ssc.1.at="apb" -hint.ssc.1.maddr="0xfffc4000" - -# SPI0 -hint.spi.0.at="apb" -hint.spi.0.maddr="0xfffc8000" -# SSC1 -hint.spi.1.at="apb" -hint.spi.1.maddr="0xfffcc000" - -# PMC -hint.pmc.0.at="apb" -hint.pmc.0.maddr="0xfffffc00" - -# USB host (ohci) -#??? maybe this needs to be on asb instead of apb -hint.ohci.at="apb" -hint.ohci.maddr="0x00500000" -# LCD controller -hint.atlcd.at="apb" -hint.atlcd.maddr="0x00600000" - +# EEPROM at24c512 - 512kbit 65,536x8 memory +hint.icee.0.at="iicbus0" +hint.icee.0.addr=0xa0 +hint.icee.0.type=16 +hint.icee.0.size=65536 +hint.icee.0.rd_sz=128 +hint.icee.0.wr_sz=128 ==== //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/debug.h#2 (text+ko) ==== @@ -23,26 +23,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/debug.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/debug.h 240415 2012-09-12 18:05:43Z mm $ */ #ifndef _OPENSOLARIS_SYS_DEBUG_H_ #define _OPENSOLARIS_SYS_DEBUG_H_ #ifdef _KERNEL -#include <sys/types.h> #include <sys/systm.h> #include_next <sys/debug.h> - -#define assfail(a, f, l) \ - (panic("solaris assert: %s, file: %s, line: %d", (a), (f), (l)), 0) +#else /* !_KERNEL */ -#define assfail3(a, lv, op, rv, f, l) \ - panic("solaris assert: %s (0x%jx %s 0x%jx), file: %s, line: %d", \ - (a), (uintmax_t)(lv), (op), (uintmax_t)(rv), (f), (l)) -#else /* !_KERNEL */ #include_next <sys/debug.h> -#endif +#include <sys/assfail.h> +#endif /* _KERNEL */ #endif /* _OPENSOLARIS_SYS_DEBUG_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211050807.qA587AMC087528>