From owner-svn-src-head@FreeBSD.ORG Mon Jul 30 21:30:44 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 816291065670; Mon, 30 Jul 2012 21:30:44 +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 6BF198FC12; Mon, 30 Jul 2012 21:30:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6ULUi6R045857; Mon, 30 Jul 2012 21:30:44 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6ULUi9M045851; Mon, 30 Jul 2012 21:30:44 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201207302130.q6ULUi9M045851@svn.freebsd.org> From: Warner Losh Date: Mon, 30 Jul 2012 21:30:44 +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: r238922 - head/sys/arm/at91 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2012 21:30:44 -0000 Author: imp Date: Mon Jul 30 21:30:43 2012 New Revision: 238922 URL: http://svn.freebsd.org/changeset/base/238922 Log: These files will support the whole at91sam9x5 family when done, so rename them now before they get copied further afield... Added: head/sys/arm/at91/at91sam9x5.c - copied, changed from r238879, head/sys/arm/at91/at91sam9x25.c head/sys/arm/at91/at91sam9x5reg.h - copied, changed from r238879, head/sys/arm/at91/at91sam9x25reg.h Deleted: head/sys/arm/at91/at91sam9x25.c head/sys/arm/at91/at91sam9x25reg.h Modified: head/sys/arm/at91/files.at91 head/sys/arm/at91/std.atmel head/sys/arm/at91/std.sam9x25ek Copied and modified: head/sys/arm/at91/at91sam9x5.c (from r238879, head/sys/arm/at91/at91sam9x25.c) ============================================================================== --- head/sys/arm/at91/at91sam9x25.c Sun Jul 29 01:01:35 2012 (r238879, copy source) +++ head/sys/arm/at91/at91sam9x5.c Mon Jul 30 21:30:43 2012 (r238922) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include #include Copied and modified: head/sys/arm/at91/at91sam9x5reg.h (from r238879, head/sys/arm/at91/at91sam9x25reg.h) ============================================================================== --- head/sys/arm/at91/at91sam9x25reg.h Sun Jul 29 01:01:35 2012 (r238879, copy source) +++ head/sys/arm/at91/at91sam9x5reg.h Mon Jul 30 21:30:43 2012 (r238922) @@ -27,8 +27,8 @@ /* $FreeBSD$ */ -#ifndef AT91SAM9X25REG_H_ -#define AT91SAM9X25REG_H_ +#ifndef AT91SAM9X5REG_H_ +#define AT91SAM9X5REG_H_ #ifndef AT91SAM9X25_MASTER_CLOCK #define AT91SAM9X25_MASTER_CLOCK ((18432000 * 43)/6) @@ -312,5 +312,4 @@ #define AT91SAM9X25_SDRAMC_ISR 0x20 #define AT91SAM9X25_SDRAMC_MDR 0x24 -#endif /* AT91SAM9X25REG_H_*/ - +#endif /* AT91SAM9X5REG_H_*/ Modified: head/sys/arm/at91/files.at91 ============================================================================== --- head/sys/arm/at91/files.at91 Mon Jul 30 21:19:19 2012 (r238921) +++ head/sys/arm/at91/files.at91 Mon Jul 30 21:30:43 2012 (r238922) @@ -33,7 +33,7 @@ arm/at91/at91rm9200_devices.c optional a arm/at91/at91sam9260.c optional at91sam9260 arm/at91/at91sam9g20.c optional at91sam9g20 arm/at91/at91sam9g45.c optional at91sam9g45 -arm/at91/at91sam9x25.c optional at91sam9x25 +arm/at91/at91sam9x5.c optional at91sam9x5 # # All the boards we support # Modified: head/sys/arm/at91/std.atmel ============================================================================== --- head/sys/arm/at91/std.atmel Mon Jul 30 21:19:19 2012 (r238921) +++ head/sys/arm/at91/std.atmel Mon Jul 30 21:30:43 2012 (r238922) @@ -10,7 +10,7 @@ device at91rm9200 device at91sam9260 device at91sam9g20 device at91sam9g45 -device at91sam9x25 +device at91sam9x5 # bring in the sam specific timers and such device at91sam9 Modified: head/sys/arm/at91/std.sam9x25ek ============================================================================== --- head/sys/arm/at91/std.sam9x25ek Mon Jul 30 21:19:19 2012 (r238921) +++ head/sys/arm/at91/std.sam9x25ek Mon Jul 30 21:30:43 2012 (r238922) @@ -8,4 +8,4 @@ options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 device at91_board_sam9x25ek -device at91sam9x25 +device at91sam9x5