From owner-p4-projects@FreeBSD.ORG Mon Nov 13 20:55:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B971116A534; Mon, 13 Nov 2006 20:55:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7906316A527 for ; Mon, 13 Nov 2006 20:55:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6F9C43DA0 for ; Mon, 13 Nov 2006 20:53:54 +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 kADKrsmi094833 for ; Mon, 13 Nov 2006 20:53:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kADKrsfI094830 for perforce@freebsd.org; Mon, 13 Nov 2006 20:53:54 GMT (envelope-from imp@freebsd.org) Date: Mon, 13 Nov 2006 20:53:54 GMT Message-Id: <200611132053.kADKrsfI094830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 109881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Nov 2006 20:55:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=109881 Change 109881 by imp@imp_lighthouse on 2006/11/13 20:53:40 No, BOOT_FLAVOR should be lower case. It breaks our builds if is upper case, and we do all the right case conversion. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#27 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#12 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#14 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#27 (text+ko) ==== @@ -5,8 +5,8 @@ __at91_boot_Makefile.inc__: -# TSC, KB920X are the supported flavors -BOOT_FLAVOR=KB920X +# tsc, kb920x are the supported flavors +BOOT_FLAVOR=kb920x CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#12 (text) ==== @@ -41,6 +41,6 @@ printf("\nWriting EEPROM from 0x%x to addr 0, 0x%x bytes\n", addr, len); WriteEEPROM(0, addr, len); - printf("\nWrite complete. Press reset\n"); + printf("\nWrote %d bytes. Press reset\n", len); return (1); } ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/Makefile#14 (text+ko) ==== @@ -11,7 +11,7 @@ .include -.if ${BOOT_FLAVOR} == "KB920X" +.if ${BOOT_FLAVOR} == "kb920x" CFLAGS+=-DBOOT_IIC .endif CFLAGS+= \