PERFORCE change 110197 for review

Warner Losh imp at FreeBSD.org
Tue Nov 21 17:20:55 UTC 2006


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

Change 110197 by imp at imp_lighthouse on 2006/11/18 08:41:33

	Move MAC
	Save 82 byes by eliminating the spinner.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#30 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#6 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#7 edit

Differences ...

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

@@ -82,8 +82,6 @@
     RBX_VERBOSE
 };
 
-unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
-
 unsigned dsk_start;
 static char cmd[512];
 static char kname[1024];

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

@@ -33,7 +33,7 @@
 #include "board.h"
 #include "sd-card.h"
 
-extern unsigned char mac[];
+unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
 
 static void
 MacFromEE()
@@ -66,8 +66,5 @@
 int
 drvread(void *buf, unsigned lba, unsigned nblk)
 {
-    static unsigned c = 0x2d5c7c2f;
-
-    printf("%c\b", c = c << 8 | c >> 24);
     return (MCI_read((char *)buf, lba << 9, nblk << 9));
 }

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

@@ -9,11 +9,10 @@
 #include "board.h"
 #include "sd-card.h"
 
-extern unsigned char mac[];
+unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
 
 #define KLUDGE_STRAP
 #define TSC_FPGA
-#define XMODEM_DL
 
 #ifdef TSC_FPGA
 #include "at91rm9200.h"
@@ -129,11 +128,8 @@
     SPI_InitFlash();
     fpga_load();
 #endif
-    printf("EEinit\n");
     EEInit();
-    printf("mac\n");
     MacFromEE();
-    printf("EEEEEE\n");
     EMAC_Init();
     sdcard_init();
     EMAC_SetMACAddress(mac);
@@ -145,8 +141,5 @@
 int
 drvread(void *buf, unsigned lba, unsigned nblk)
 {
-    static unsigned c = 0x2d5c7c2f;
-
-    printf("%c\b", c = c << 8 | c >> 24);
     return (MCI_read((char *)buf, lba << 9, nblk << 9));
 }


More information about the p4-projects mailing list