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
//
*****************************************************************************
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
