From owner-svn-src-all@FreeBSD.ORG Tue Nov 25 19:05:47 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C2001065672; Tue, 25 Nov 2008 19:05:47 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4B3048FC16; Tue, 25 Nov 2008 19:05:47 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPJ5ljW032001; Tue, 25 Nov 2008 19:05:47 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAPJ5kLX031990; Tue, 25 Nov 2008 19:05:46 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200811251905.mAPJ5kLX031990@svn.freebsd.org> From: Warner Losh Date: Tue, 25 Nov 2008 19:05:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185307 - in head/sys/arm: at91 conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2008 19:05:47 -0000 Author: imp Date: Tue Nov 25 19:05:46 2008 New Revision: 185307 URL: http://svn.freebsd.org/changeset/base/185307 Log: Convert BWCT and HL200 over to new board mechanism as well. The TSC4370 config file wasn't committed to this tree, so I don't know if my changes will work on it or not. Added: head/sys/arm/at91/board_bwct.c - copied, changed from r185305, head/sys/arm/at91/board_kb920x.c head/sys/arm/at91/board_hl200.c - copied, changed from r185305, head/sys/arm/at91/board_kb920x.c head/sys/arm/at91/board_tsc4370.c - copied, changed from r185305, head/sys/arm/at91/board_kb920x.c head/sys/arm/at91/std.bwct (contents, props changed) - copied, changed from r185305, head/sys/arm/at91/std.kb920x head/sys/arm/at91/std.hl200 (contents, props changed) - copied, changed from r185305, head/sys/arm/at91/std.kb920x head/sys/arm/at91/std.tsc4370 (contents, props changed) - copied, changed from r185305, head/sys/arm/at91/std.kb920x Modified: head/sys/arm/at91/board_kb920x.c head/sys/arm/at91/files.at91 head/sys/arm/at91/std.kb920x head/sys/arm/conf/BWCT head/sys/arm/conf/HL200 Copied and modified: head/sys/arm/at91/board_bwct.c (from r185305, head/sys/arm/at91/board_kb920x.c) ============================================================================== --- head/sys/arm/at91/board_kb920x.c Tue Nov 25 18:40:40 2008 (r185305, copy source) +++ head/sys/arm/at91/board_bwct.c Tue Nov 25 19:05:46 2008 (r185307) @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_at91.h" - #include __FBSDID("$FreeBSD$"); #include @@ -58,24 +56,11 @@ board_init(void) /* PIOA's B periph: Turn USART 3's TX/RX pins */ at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA6_RXD3, 0); at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA5_TXD3, 1); -#ifdef AT91_TSC - /* We're using TC0's A1 and A2 input */ - at91_pio_use_periph_b(AT91RM92_PIOA_BASE, - AT91C_PA19_TIOA1 | AT91C_PA21_TIOA2, 0); -#endif /* PIOB's A periph: Turn USART 1's TX/RX pins */ at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB21_RXD1, 0); at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB20_TXD1, 1); /* Pin assignment */ -#ifdef AT91_TSC - /* Assert PA24 low -- talk to rubidium */ - at91_pio_use_gpio(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); - at91_pio_gpio_output(AT91RM92_PIOA_BASE, AT91C_PIO_PA24, 0); - at91_pio_gpio_clear(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); - at91_pio_use_gpio(AT91RM92_PIOB_BASE, - AT91C_PIO_PB16 | AT91C_PIO_PB17 | AT91C_PIO_PB18 | AT91C_PIO_PB19); -#endif return (at91_ramsize()); } Copied and modified: head/sys/arm/at91/board_hl200.c (from r185305, head/sys/arm/at91/board_kb920x.c) ============================================================================== --- head/sys/arm/at91/board_kb920x.c Tue Nov 25 18:40:40 2008 (r185305, copy source) +++ head/sys/arm/at91/board_hl200.c Tue Nov 25 19:05:46 2008 (r185307) @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_at91.h" - #include __FBSDID("$FreeBSD$"); #include @@ -49,7 +47,6 @@ board_init(void) * Since they are input pins, I think that this is the right thing * to do. */ - /* PIOA's A periph: Turn USART 0 and 2's TX/RX pins */ at91_pio_use_periph_a(AT91RM92_PIOA_BASE, AT91C_PA18_RXD0 | AT91C_PA22_RXD2, 0); @@ -58,24 +55,9 @@ board_init(void) /* PIOA's B periph: Turn USART 3's TX/RX pins */ at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA6_RXD3, 0); at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA5_TXD3, 1); -#ifdef AT91_TSC - /* We're using TC0's A1 and A2 input */ - at91_pio_use_periph_b(AT91RM92_PIOA_BASE, - AT91C_PA19_TIOA1 | AT91C_PA21_TIOA2, 0); -#endif /* PIOB's A periph: Turn USART 1's TX/RX pins */ at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB21_RXD1, 0); at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB20_TXD1, 1); - /* Pin assignment */ -#ifdef AT91_TSC - /* Assert PA24 low -- talk to rubidium */ - at91_pio_use_gpio(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); - at91_pio_gpio_output(AT91RM92_PIOA_BASE, AT91C_PIO_PA24, 0); - at91_pio_gpio_clear(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); - at91_pio_use_gpio(AT91RM92_PIOB_BASE, - AT91C_PIO_PB16 | AT91C_PIO_PB17 | AT91C_PIO_PB18 | AT91C_PIO_PB19); -#endif - return (at91_ramsize()); } Modified: head/sys/arm/at91/board_kb920x.c ============================================================================== --- head/sys/arm/at91/board_kb920x.c Tue Nov 25 18:48:13 2008 (r185306) +++ head/sys/arm/at91/board_kb920x.c Tue Nov 25 19:05:46 2008 (r185307) @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_at91.h" - #include __FBSDID("$FreeBSD$"); #include @@ -49,7 +47,6 @@ board_init(void) * Since they are input pins, I think that this is the right thing * to do. */ - /* PIOA's A periph: Turn USART 0 and 2's TX/RX pins */ at91_pio_use_periph_a(AT91RM92_PIOA_BASE, AT91C_PA18_RXD0 | AT91C_PA22_RXD2, 0); @@ -58,24 +55,9 @@ board_init(void) /* PIOA's B periph: Turn USART 3's TX/RX pins */ at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA6_RXD3, 0); at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA5_TXD3, 1); -#ifdef AT91_TSC - /* We're using TC0's A1 and A2 input */ - at91_pio_use_periph_b(AT91RM92_PIOA_BASE, - AT91C_PA19_TIOA1 | AT91C_PA21_TIOA2, 0); -#endif /* PIOB's A periph: Turn USART 1's TX/RX pins */ at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB21_RXD1, 0); at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB20_TXD1, 1); - /* Pin assignment */ -#ifdef AT91_TSC - /* Assert PA24 low -- talk to rubidium */ - at91_pio_use_gpio(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); - at91_pio_gpio_output(AT91RM92_PIOA_BASE, AT91C_PIO_PA24, 0); - at91_pio_gpio_clear(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); - at91_pio_use_gpio(AT91RM92_PIOB_BASE, - AT91C_PIO_PB16 | AT91C_PIO_PB17 | AT91C_PIO_PB18 | AT91C_PIO_PB19); -#endif - return (at91_ramsize()); } Copied and modified: head/sys/arm/at91/board_tsc4370.c (from r185305, head/sys/arm/at91/board_kb920x.c) ============================================================================== --- head/sys/arm/at91/board_kb920x.c Tue Nov 25 18:40:40 2008 (r185305, copy source) +++ head/sys/arm/at91/board_tsc4370.c Tue Nov 25 19:05:46 2008 (r185307) @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_at91.h" - #include __FBSDID("$FreeBSD$"); #include @@ -58,24 +56,20 @@ board_init(void) /* PIOA's B periph: Turn USART 3's TX/RX pins */ at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA6_RXD3, 0); at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA5_TXD3, 1); -#ifdef AT91_TSC /* We're using TC0's A1 and A2 input */ at91_pio_use_periph_b(AT91RM92_PIOA_BASE, AT91C_PA19_TIOA1 | AT91C_PA21_TIOA2, 0); -#endif /* PIOB's A periph: Turn USART 1's TX/RX pins */ at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB21_RXD1, 0); at91_pio_use_periph_a(AT91RM92_PIOB_BASE, AT91C_PB20_TXD1, 1); /* Pin assignment */ -#ifdef AT91_TSC /* Assert PA24 low -- talk to rubidium */ at91_pio_use_gpio(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); at91_pio_gpio_output(AT91RM92_PIOA_BASE, AT91C_PIO_PA24, 0); at91_pio_gpio_clear(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); at91_pio_use_gpio(AT91RM92_PIOB_BASE, AT91C_PIO_PB16 | AT91C_PIO_PB17 | AT91C_PIO_PB18 | AT91C_PIO_PB19); -#endif return (at91_ramsize()); } Modified: head/sys/arm/at91/files.at91 ============================================================================== --- head/sys/arm/at91/files.at91 Tue Nov 25 18:48:13 2008 (r185306) +++ head/sys/arm/at91/files.at91 Tue Nov 25 19:05:46 2008 (r185307) @@ -22,5 +22,7 @@ arm/at91/uart_dev_at91usart.c optional u # # All the boards we support # +arm/at91/board_bwct.c optional at91_board_bwct +arm/at91/board_hl200.c optional at91_board_hl200 arm/at91/board_kb920x.c optional at91_board_kb920x arm/at91/board_tsc4370.c optional at91_board_tsc4370 Copied and modified: head/sys/arm/at91/std.bwct (from r185305, head/sys/arm/at91/std.kb920x) ============================================================================== --- head/sys/arm/at91/std.kb920x Tue Nov 25 18:40:40 2008 (r185305, copy source) +++ head/sys/arm/at91/std.bwct Tue Nov 25 19:05:46 2008 (r185307) @@ -3,8 +3,8 @@ include "../at91/std.at91" options STARTUP_PAGETABLE_ADDR=0x20800000 makeoptions KERNPHYSADDR=0x20000000 -makeoptions KERNVIRTADDR=0xc0000000 options KERNPHYSADDR=0x20000000 +makeoptions KERNVIRTADDR=0xc0000000 options KERNVIRTADDR=0xc0000000 -device at91_board_kb920x +device at91_board_bwct Copied and modified: head/sys/arm/at91/std.hl200 (from r185305, head/sys/arm/at91/std.kb920x) ============================================================================== --- head/sys/arm/at91/std.kb920x Tue Nov 25 18:40:40 2008 (r185305, copy source) +++ head/sys/arm/at91/std.hl200 Tue Nov 25 19:05:46 2008 (r185307) @@ -1,10 +1,11 @@ #$FreeBSD$ include "../at91/std.at91" -options STARTUP_PAGETABLE_ADDR=0x20800000 -makeoptions KERNPHYSADDR=0x20000000 -makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 -options KERNVIRTADDR=0xc0000000 +options STARTUP_PAGETABLE_ADDR=0x20000000 +makeoptions KERNPHYSADDR=0x20100000 +options KERNPHYSADDR=0x20100000 +makeoptions KERNVIRTADDR=0xc0100000 +options KERNVIRTADDR=0xc0100000 +options AT91C_MASTER_CLOCK=45000000 -device at91_board_kb920x +device at91_board_hl200 Modified: head/sys/arm/at91/std.kb920x ============================================================================== --- head/sys/arm/at91/std.kb920x Tue Nov 25 18:48:13 2008 (r185306) +++ head/sys/arm/at91/std.kb920x Tue Nov 25 19:05:46 2008 (r185307) @@ -3,8 +3,8 @@ include "../at91/std.at91" options STARTUP_PAGETABLE_ADDR=0x20800000 makeoptions KERNPHYSADDR=0x20000000 -makeoptions KERNVIRTADDR=0xc0000000 options KERNPHYSADDR=0x20000000 +makeoptions KERNVIRTADDR=0xc0000000 options KERNVIRTADDR=0xc0000000 device at91_board_kb920x Copied and modified: head/sys/arm/at91/std.tsc4370 (from r185305, head/sys/arm/at91/std.kb920x) ============================================================================== --- head/sys/arm/at91/std.kb920x Tue Nov 25 18:40:40 2008 (r185305, copy source) +++ head/sys/arm/at91/std.tsc4370 Tue Nov 25 19:05:46 2008 (r185307) @@ -7,4 +7,4 @@ makeoptions KERNVIRTADDR=0xc0000000 options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 -device at91_board_kb920x +device at91_board_tsc4370 Modified: head/sys/arm/conf/BWCT ============================================================================== --- head/sys/arm/conf/BWCT Tue Nov 25 18:48:13 2008 (r185306) +++ head/sys/arm/conf/BWCT Tue Nov 25 19:05:46 2008 (r185307) @@ -22,7 +22,7 @@ ident BWCT options VERBOSE_INIT_ARM options AT91_BWCT -include "../at91/std.kb920x" +include "../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints #hints "hints.at91rm9200" Modified: head/sys/arm/conf/HL200 ============================================================================== --- head/sys/arm/conf/HL200 Tue Nov 25 18:48:13 2008 (r185306) +++ head/sys/arm/conf/HL200 Tue Nov 25 19:05:46 2008 (r185307) @@ -1,5 +1,4 @@ -# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202 -# AT91RM9200 based Hot-e configuration file +# Kernel configuration for the AT91RM9200 based Hot-e configuration file # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -20,23 +19,14 @@ ident HL200 -include "../at91/std.at91" -files "../at91/files.kb920x" - -options STARTUP_PAGETABLE_ADDR=0x20000000 -makeoptions KERNPHYSADDR=0x20100000 -makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x20100000 -options KERNVIRTADDR=0xc0100000 +include "../at91/std.hl200" #To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. hints "KB920X.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB options KDB -options AT91C_MASTER_CLOCK=45000000 options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -46,17 +36,17 @@ options FFS #Berkeley Fast Filesystem #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP_NFSROOT -options BOOTP -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=ate0 -options BOOTP_COMPAT +options BOOTP_NFSROOT +options BOOTP +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=ate0 +options BOOTP_COMPAT #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -124,20 +114,20 @@ device kue # Kawasa device rue # RealTek RTL8150 USB Ethernet device udav # usb serial -device ucom -device uark -device ubsa -device ubser -device uftdi -device uipaq -device uplcom -device uvisor -device uvscom +device ucom +device uark +device ubsa +#device ubser # not yet converted. +device uftdi +device uipaq +device uplcom +device uvisor +device uvscom # SCSI peripherals -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) -device cd # CD -device pass # Passthrough device (direct SCSI access) +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct SCSI access) # Wireless NIC cards device wlan # 802.11 support device wlan_wep # 802.11 WEP support