PERFORCE change 106157 for review

[Warner Losh]

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

Change 106157 by imp at imp_lighthouse on 2006/09/15 17:19:50

	integrate

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#20 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#20 (text+ko) ====

@@ -180,6 +180,7 @@
 }
 #endif
 
+#ifdef BOOT_TSC
 static void
 MacFromEE()
 {	
@@ -204,6 +205,7 @@
 	printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
 	  mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
+#endif
 
 int
 main(void)
@@ -212,11 +214,13 @@
     ino_t ino;
 
 #ifdef TSC_FPGA
-	SPI_InitFlash();
-	fpga_load();
+    SPI_InitFlash();
+    fpga_load();
 #endif
+#ifdef BOOT_TSC
     EEInit();
     MacFromEE();
+#endif
     EMAC_Init();
     sdcard_init();
     EMAC_SetMACAddress(mac);