Armv6 build failures

[Tim Kientzle]

Updated my armv6 tree a couple of hours ago and am now seeing these:

$ make TARGET_ARCH=arm TARGET_CPUTYPE=armv6 buildworld 

cc  -O -pipe -march=armv6 -DARM_ARCH_6=1 -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/include -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/../../include -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/arm -DNLS  -D__DBINTERFACE_PRIVATE -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/../../contrib/gdtoa -DINET6 -I/usr/obj/arm.arm/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/resolv -D_ACL_PRIVATE -DPOSIX_MISTAKE -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/../../contrib/jemalloc/include -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/../../contrib/tzcode/stdtime -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/stdtime -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/locale -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/rpc -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/arm/softfloat -I/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/softfloat -DSOFTFLOAT_FOR_GCC -DYP -DNS_CACHING -DSYMBOL_VERSIONING -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/arm/gen/_set_tp.c -o _set_tp.o
/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/arm/gen/_set_tp.c: In function '_set_tp':
/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/arm/gen/_set_tp.c:38: error: 'ARM_TP_ADDRESS' undeclared (first use in this function)
/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/arm/gen/_set_tp.c:38: error: (Each undeclared identifier is reported only once
/usr/home/tim/projects/beaglebsd/src-armv6/lib/libc/arm/gen/_set_tp.c:38: error: for each function it appears in.)
*** Error code 1

$ make TARGET_ARCH=arm KERNCONF=BEAGLEBONE buildkernel

cc -mlittle-endian -c -O -pipe  -std=c99 -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/usr/home/tim/projects/beaglebsd/src-armv6/sys -I/usr/home/tim/projects/beaglebsd/src-armv6/sys/contrib/altq -I/usr/home/tim/projects/beaglebsd/src-armv6/sys/contrib/libfdt -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -D_ARM_ARCH_6 -ffreestanding -Werror  /usr/home/tim/projects/beaglebsd/src-armv6/sys/arm/ti/cpsw/if_cpsw.c
cc1: warnings being treated as errors
/usr/home/tim/projects/beaglebsd/src-armv6/sys/arm/ti/cpsw/if_cpsw.c: In function 'cpsw_attach':
/usr/home/tim/projects/beaglebsd/src-armv6/sys/arm/ti/cpsw/if_cpsw.c:234: warning: passing argument 2 of 'fdt_get_phyaddr' from incompatible pointer type
/usr/home/tim/projects/beaglebsd/src-armv6/sys/arm/ti/cpsw/if_cpsw.c:234: error: too few arguments to function 'fdt_get_phyaddr'
*** Error code 1

For the latter, it looks like this might fix it?  (Copied without understanding from other places where fdt_get_phyaddr is called.)

Index: if_cpsw.c
===================================================================
--- if_cpsw.c	(revision 235097)
+++ if_cpsw.c	(working copy)
@@ -231,7 +231,7 @@
 		cpsw_sc = sc;
 
 	/* Get phy address from fdt */
-	if (fdt_get_phyaddr(sc->node, &phy) != 0) {
+	if (fdt_get_phyaddr(sc->node, sc->dev, &phy, (void **)&sc->phy_sc) != 0) {
 		device_printf(dev, "failed to get PHY address from FDT\n");
 		return (ENXIO);
 	}