From owner-svn-src-all@FreeBSD.ORG  Fri May 11 14:40:25 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C0F1C1065676;
	Fri, 11 May 2012 14:40:25 +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 AB2028FC08;
	Fri, 11 May 2012 14:40:25 +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 q4BEePg3087546;
	Fri, 11 May 2012 14:40:25 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4BEePPh087543;
	Fri, 11 May 2012 14:40:25 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201205111440.q4BEePPh087543@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 11 May 2012 14:40:25 +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: r235271 - in head/sys: arm/at91 boot/arm/at91/libat91
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 May 2012 14:40:25 -0000

Author: imp
Date: Fri May 11 14:40:25 2012
New Revision: 235271
URL: http://svn.freebsd.org/changeset/base/235271

Log:
  Hack to unbreak boot2 for at91rm9200 boot loader.  When the at91sam
  code came in, it moved things around which wound up breaking the
  build.  We have to do this bit of a hack to avoid duplication of a lot
  of #defines.

Modified:
  head/sys/arm/at91/at91_pioreg.h
  head/sys/boot/arm/at91/libat91/at91rm9200.h

Modified: head/sys/arm/at91/at91_pioreg.h
==============================================================================
--- head/sys/arm/at91/at91_pioreg.h	Fri May 11 13:20:17 2012	(r235270)
+++ head/sys/arm/at91/at91_pioreg.h	Fri May 11 14:40:25 2012	(r235271)
@@ -28,6 +28,7 @@
 #ifndef ARM_AT91_AT91_PIOREG_H
 #define ARM_AT91_AT91_PIOREG_H
 
+#ifndef ATMEL_ENV
 /* Registers */
 #define PIO_PER		0x00		/* PIO Enable Register */
 #define PIO_PDR		0x04		/* PIO Disable Register */
@@ -65,6 +66,7 @@
 #define PIO_OWDR	0xa4		/* PIO Output Write Disable Register */
 #define PIO_OWSR	0xa8		/* PIO Output Write Status Register */
 		/*	0xac		   reserved */
+#endif
 
 #define AT91C_PIO_PA0        ((unsigned int) 1 <<  0) // Pin Controlled by PA0
 #define AT91C_PIO_PA1        ((unsigned int) 1 <<  1) // Pin Controlled by PA1

Modified: head/sys/boot/arm/at91/libat91/at91rm9200.h
==============================================================================
--- head/sys/boot/arm/at91/libat91/at91rm9200.h	Fri May 11 13:20:17 2012	(r235270)
+++ head/sys/boot/arm/at91/libat91/at91rm9200.h	Fri May 11 14:40:25 2012	(r235271)
@@ -41,6 +41,8 @@
 #ifndef AT91RM9200_H
 #define	AT91RM9200_H
 
+#define ATMEL_ENV
+
 typedef volatile unsigned int AT91_REG;// Hardware register definition
 
 // *****************************************************************************