PERFORCE change 95779 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=95779

Change 95779 by imp at imp_harmony on 2006/04/21 07:55:27

	More manual merging.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#10 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#2 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#4 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/doit.c#2 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#2 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/README#3 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#4 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#10 (text) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.3 2006/04/19 17:16:48 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.4 2006/04/21 07:45:57 imp Exp $
  */
 
 #include "at91rm9200.h"

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#2 (text) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.3 2006/04/19 17:16:48 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot0iic/main.c,v 1.1 2006/04/21 06:48:52 imp Exp $
  */
 
 #include "at91rm9200.h"

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#4 (text) ====

@@ -1,4 +1,4 @@
-#  $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.3 2006/04/19 17:16:48 imp Exp $
+#  $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.1 2006/04/21 06:51:08 imp Exp $
 
 .PATH:	${.CURDIR}/../boot0
 

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/doit.c#2 (text+ko) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.3 2006/04/19 17:16:48 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot0spi/doit.c,v 1.1 2006/04/21 06:51:08 imp Exp $
  */
 
 typedef void fn_t(void);

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#2 (text) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.3 2006/04/19 17:16:48 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot0spi/main.c,v 1.1 2006/04/21 06:51:08 imp Exp $
  */
 
 #include "at91rm9200.h"

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/README#3 (text+ko) ====

@@ -1,3 +1,5 @@
+$FreeBSD: src/sys/boot/arm/at91/bootspi/README,v 1.1 2006/04/19 17:16:48 imp Exp $
+
 This image is intended to be programmed into boot EEPROM.  The image is nearly
 0x4000 so it will not fit in KB9200's 0x2000.  It is intended for KB9201 or
 later.  Alternatively, the KB9200 can be upgraded with larger EEPROM.
@@ -30,30 +32,3 @@
 	tftp 		- download image via tftp
 	w 		- update auto command table
 	x 		- download image via xmodem
-
-base files in this directory:
-
-arm_init.s
-AT91RM9200.h
-at91rm9200_lowlevel.c
-at91rm9200_lowlevel.h
-debug_io.c
-debug_io.h
-eeprom.c
-eeprom.h
-emac.c
-emac.h
-env_vars.c
-env_vars.h
-linker.cfg
-loader_prompt.c
-loader_prompt.h
-main.c
-Makefile
-p_string.c
-p_string.h
-tag_list.c
-tag_list.h
-xmodem.c
-xmodem.h
-README

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#4 (text+ko) ====

@@ -18,6 +18,8 @@
  * owners.  This software is not copyrighted and is intended for reference
  * only.
  * END_BLOCK
+ *
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.1 2006/04/19 17:16:48 imp Exp $
  ******************************************************************************/
 
 #include "env_vars.h"

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 (text) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.h,v 1.1 2006/04/12 21:22:44 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h,v 1.1 2006/04/19 17:16:49 imp Exp $
  */
 
 #ifndef _AT91RM9200_LOWLEVEL_H_