From owner-svn-src-head@FreeBSD.ORG Tue Jan 1 19:44:49 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 44DC27FC; Tue, 1 Jan 2013 19:44:49 +0000 (UTC) (envelope-from rwatson@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id F21668FC13; Tue, 1 Jan 2013 19:44:48 +0000 (UTC) Received: from [192.168.2.119] (host86-129-88-139.range86-129.btcentralplus.com [86.129.88.139]) by cyrus.watson.org (Postfix) with ESMTPSA id B30CE46B39; Tue, 1 Jan 2013 14:44:41 -0500 (EST) Subject: Re: svn commit: r244899 - head/sys/mips/beri Mime-Version: 1.0 (Apple Message framework v1283) Content-Type: text/plain; charset=iso-8859-1 From: "Robert N. M. Watson" In-Reply-To: Date: Tue, 1 Jan 2013 19:44:39 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <7E6051EE-8632-4A95-BB54-7FC31C972795@freebsd.org> References: <201212311106.qBVB6chM016661@svn.freebsd.org> To: Garrett Cooper X-Mailer: Apple Mail (2.1283) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jan 2013 19:44:49 -0000 Hi Garrett: Thanks for the report -- I didn't realise tinderbox was now building all = kernels, or I would have merged my fix from P4 more quickly. The patch you've attached isn't quite the right one -- BERI supports = both FDT and non-FDT kernels, so we shouldn't build the Openfirmware = headers in the non-FDT case. Instead, I've ifdef'd inclusion of the = headers. However, as is probably clear from my breaking the non-FDT = kernel configuration, I have been working only with FDT kernels. :-) Thanks, Robert On 1 Jan 2013, at 18:34, Garrett Cooper wrote: > On Mon, Dec 31, 2012 at 3:06 AM, Robert Watson = wrote: >> Author: rwatson >> Date: Mon Dec 31 11:06:37 2012 >> New Revision: 244899 >> URL: http://svnweb.freebsd.org/changeset/base/244899 >>=20 >> Log: >> If FDT is compiled into a FreeBSD/beri kernel, initialise = OpenFirmware. >>=20 >> Sponsored by: DARPA, AFRL >=20 > This broke the mips:mips64 tinderbox: >=20 > /obj/src/make.amd64/make -V CFILES_NOZFS -V SYSTEM_CFILES -V > GEN_CFILES | MKDEP_CPP=3D"cc -E" CC=3D"cc" xargs mkdep -a -f .newdep = -O > -pipe -std=3Dc99 -g -Wall -Wredundant-decls -Wnested-externs > -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline > -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions > -Wmissing-include-dirs -fdiagnostics-show-option -nostdinc -I. > -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/ipfilter > -I/src/sys/dev/ath -I/src/sys/dev/ath/ath_hal -I/src/sys/contrib/ngatm > -I/src/sys/dev/twa -I/src/sys/dev/cxgb -I/src/sys/dev/cxgbe > -I/src/sys/contrib/libfdt -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS > -include opt_global.h -fno-common -finline-limit=3D8000 --param > inline-unit-growth=3D10000 --param large-function-growth=3D100000 = --param > max-inline-insns-single=3D10000 -fno-pic -mno-abicalls -G0 > -DKERNLOADADDR=3D0xffffffff80100000 -march=3Dmips64 -mabi=3D64 = -msoft-float > -ffreestanding > In file included from /src/sys/dev/fdt/fdt_common.h:37, > from /src/sys/mips/beri/beri_machdep.c:58: > /src/sys/dev/ofw/ofw_bus.h:36:24: error: ofw_bus_if.h: No such file or = directory > mkdep: compile failed > *** [.depend] Error code 1 >=20 > The patch I committed to my git repo fixes that by adding > ofw_bus_if.m to files.beri ( > = https://github.com/yaneurabeya/freebsd/commit/ac9221dc567c67822b6f61cadbfa= c3fc1e32df04 > ). > Thanks! > -Garrett >=20 >=20 > [gcooper@bayonetta /scratch/git/github/yaneurabeya-freebsd-head]$ make > KERNCONF=3DBERI_DE4_MDROOT TARGET=3Dmips TARGET_ARCH=3Dmips64 = buildkernel > ... > cc -shared -fno-pic -mno-abicalls -G0 > -DKERNLOADADDR=3D0xffffffff80100000 -march=3Dmips64 -mabi=3D64 = -nostdlib > hack.c -o hack.So > rm -f hack.c > sed s/KERNLOADADDR/0xffffffff80100000/g > /scratch/git/github/yaneurabeya-freebsd-head/sys/conf/ldscript.mips > > ldscript.mips > MAKE=3Dmake sh = /scratch/git/github/yaneurabeya-freebsd-head/sys/conf/newvers.sh > BERI_DE4_MDROOT > cc -c -O -pipe -std=3Dc99 -g -Wall -Wredundant-decls -Wnested-externs > -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline > -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions > -Wmissing-include-dirs -fdiagnostics-show-option -nostdinc -I. > -I/scratch/git/github/yaneurabeya-freebsd-head/sys > -I/scratch/git/github/yaneurabeya-freebsd-head/sys/contrib/altq > -I/scratch/git/github/yaneurabeya-freebsd-head/sys/contrib/libfdt > -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h > -fno-common -finline-limit=3D8000 --param inline-unit-growth=3D10000 > --param large-function-growth=3D100000 --param > max-inline-insns-single=3D10000 -fno-pic -mno-abicalls -G0 > -DKERNLOADADDR=3D0xffffffff80100000 -march=3Dmips64 -mabi=3D64 = -msoft-float > -ffreestanding -Werror vers.c > linking kernel.debug > text data bss dec hex filename > 4108957 8653440 283024 13045421 c70ead kernel.debug > objcopy --only-keep-debug kernel.debug kernel.symbols > objcopy --strip-debug --add-gnu-debuglink=3Dkernel.symbols = kernel.debug kernel > objcopy --strip-symbol '$d' --strip-symbol '$a' -g --strip-symbol > '$t' kernel.debug kernel.tmp > sed -e s/0xffffffff80100000/0x807963c0/ -e s/" + SIZEOF_HEADERS"// > ldscript.mips > ldscript.mips.tramp.noheader > cc -O -nostdlib -I. -I/scratch/git/github/yaneurabeya-freebsd-head/sys > -fno-pic -mno-abicalls -G0 -DKERNLOADADDR=3D0xffffffff80100000 > -march=3Dmips64 -mabi=3D64 -Xlinker -T -Xlinker > ldscript.mips.tramp.noheader -DKERNNAME=3D"\"kernel.tmp\"" = -DELFSIZE=3D64 > = /scratch/git/github/yaneurabeya-freebsd-head/sys/mips/mips/elf_trampoline.= c > /scratch/git/github/yaneurabeya-freebsd-head/sys/mips/mips/inckern.S > -o kernel.tramp.elf > objcopy -S -O binary kernel.tramp.elf kernel.tramp.bin > cd /scratch/git/github/yaneurabeya-freebsd-head/sys/modules; > = MAKEOBJDIRPREFIX=3D/usr/obj/mips.mips64/scratch/git/github/yaneurabeya-fre= ebsd-head/sys/BERI_DE4_MDROOT/modules > KMODDIR=3D/boot/kernel MACHINE_CPUARCH=3Dmips MODULES_OVERRIDE=3D"""" > DEBUG_FLAGS=3D"-g" MACHINE=3Dmips MACHINE_ARCH=3Dmips64 > = KERNBUILDDIR=3D"/usr/obj/mips.mips64/scratch/git/github/yaneurabeya-freebs= d-head/sys/BERI_DE4_MDROOT" > SYSDIR=3D"/scratch/git/github/yaneurabeya-freebsd-head/sys" make all > -------------------------------------------------------------- >>>> Kernel build for BERI_DE4_MDROOT completed on Tue Jan 1 10:31:25 = PST 2013 > --------------------------------------------------------------