From owner-p4-projects@FreeBSD.ORG  Tue Nov 21 17:20:55 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16FE016CF0F; Tue, 21 Nov 2006 17:20:41 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 229C616ADFE
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:20:36 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7199843F9C
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:14:45 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kALHF8Lm066862
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:15:08 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kALHF7NS066857
	for perforce@freebsd.org; Tue, 21 Nov 2006 17:15:07 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 21 Nov 2006 17:15:07 GMT
Message-Id: <200611211715.kALHF7NS066857@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110197 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Nov 2006 17:20:55 -0000

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

Change 110197 by imp@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));
 }