PERFORCE change 111513 for review

[Bernd Walter]

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

Change 111513 by ticso at ticso on 2006/12/11 23:23:21

	No need to #ifdef other boards in this file

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/bwct_board.c#2 edit

Differences ...

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

@@ -9,28 +9,14 @@
 #include "board.h"
 #include "sd-card.h"
 
-unsigned char mac[6] = { 0x00, 0x0e, 0x42, 02, 0, 21 };
-
-#define KLUDGE_STRAP
+unsigned char mac[6];
 
 static void
 MacFromEE()
 {	
 #if 0
 	uint32_t sig;
-#ifdef KLUDGE_STRAP
-	uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20,
-			      0x00, 0x00, 0x00, 0x03 };
-#endif
 
-#ifdef KLUDGE_STRAP
-	printf("writing...\n");
-	sig = 0xaa55aa55;
-	EEWrite(0, (uint8_t *)&sig, sizeof(sig));
-	printf("euid64\n");
-	EEWrite(48, euid64, sizeof(euid64));
-	printf("done\n");
-#endif
 	sig = 0;
 	EERead(0, (uint8_t *)&sig, sizeof(sig));
 	if (sig != 0xaa55aa55)
@@ -38,21 +24,12 @@
 	EERead(48, mac, 3);
 	EERead(48+5, mac+3, 3);
 #else
-#ifdef BOOT_BWCT
 	mac[0] = 0x00;
 	mac[1] = 0x0e;
 	mac[2] = 0x42;
 	mac[3] = 0x02;
 	mac[4] = 0x00;
 	mac[5] = 0x21;
-#else
-	mac[0] = 0;
-	mac[1] = 0x30;
-	mac[2] = 0x96;
-	mac[3] = 0;
-	mac[4] = 0;
-	mac[5] = 3;
-#endif
 #endif
 	printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
 	  mac[1], mac[2], mac[3], mac[4], mac[5]);