From owner-p4-projects@FreeBSD.ORG Tue Mar 12 22:04:39 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FD262B1; Tue, 12 Mar 2013 22:04:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C5CA92AF for ; Tue, 12 Mar 2013 22:04:38 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 98AB6AD7 for ; Tue, 12 Mar 2013 22:04:38 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CM4cT2007357 for ; Tue, 12 Mar 2013 22:04:38 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2CM4csv007354 for perforce@freebsd.org; Tue, 12 Mar 2013 22:04:38 GMT (envelope-from brooks@freebsd.org) Date: Tue, 12 Mar 2013 22:04:38 GMT Message-Id: <201303122204.r2CM4csv007354@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222821 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 22:04:39 -0000 http://p4web.freebsd.org/@@222821?ac=10 Change 222821 by brooks@brooks_zenith on 2013/03/12 22:03:39 IF FreeBSD/BERI @ 222820 Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#12 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd/writefile/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/writefile/eav.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/writefile/eav.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/writefile/writefile.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse.c#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#13 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#12 (text+ko) ==== @@ -12,7 +12,8 @@ pictview \ spinner \ share \ - wr + wr \ + writefile .include ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/atse/if_atse.c#3 (text+ko) ==== @@ -727,7 +727,7 @@ } /* - * If we find a locally administered address with a 0x0 ending + * If we find an Altera prefixed address with a 0x0 ending * adjust by device unit. If not and this is not the first * Ethernet, go to random. */ @@ -741,7 +741,8 @@ "random hadware address.\n"); goto get_random; } - if ((sc->atse_eth_addr[0] & 0x2) == 0 || + if ((sc->atse_eth_addr[0] & ~0x2) != 0 || + sc->atse_eth_addr[1] != 0x07 || sc->atse_eth_addr[2] != 0xed || (sc->atse_eth_addr[5] & 0x0f) != 0x0) { device_printf(sc->atse_dev, "Ethernet address not meeting our " "multi-MAC standards. Falling back to random hadware " ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#13 (text+ko) ==== @@ -21,10 +21,10 @@ hint.map.2.name="reserved" # Kernel on the second chip -hint.map.5.at="cfid0" -hint.map.5.start=0x02000000 -hint.map.5.end=0x03fe0000 -hint.map.5.name="kernel" +hint.map.3.at="cfid0" +hint.map.3.start=0x02000000 +hint.map.3.end=0x03fe0000 +hint.map.3.name="kernel" # Area for use by the boot loader hint.map.4.at="cfid0"