PERFORCE change 175071 for review

Rafal Jaworowski raj at FreeBSD.org
Thu Feb 25 14:23:46 UTC 2010 

http://p4web.freebsd.org/chv.cgi?CH=175071

Change 175071 by raj at raj_fdt on 2010/02/25 14:23:40

	Adjust build infrastructure after the dtc/libfdt files reorg.

Affected files ...

.. //depot/projects/fdt/gnu/usr.bin/dtc/Makefile#3 edit
.. //depot/projects/fdt/sys/boot/fdt/Makefile#2 edit
.. //depot/projects/fdt/sys/boot/uboot/lib/Makefile#3 edit
.. //depot/projects/fdt/sys/conf/Makefile.arm#4 edit
.. //depot/projects/fdt/sys/conf/Makefile.powerpc#3 edit
.. //depot/projects/fdt/sys/conf/files#14 edit
.. //depot/projects/fdt/sys/conf/files.arm#5 edit
.. //depot/projects/fdt/sys/conf/files.powerpc#18 edit
.. //depot/projects/fdt/sys/dev/fdt/fdt_common.h#7 edit
.. //depot/projects/fdt/sys/dev/ofw/ofw_fdt.c#5 edit

Differences ...

==== //depot/projects/fdt/gnu/usr.bin/dtc/Makefile#3 (text+ko) ====

@@ -1,7 +1,8 @@
 .include <bsd.own.mk>
 
-DTCDIR=	${.CURDIR}/../../../sys/contrib/dtc
-.PATH: ${DTCDIR} ${DTCDIR}/libfdt ${DTCDIR}/tests
+DTCDIR=	${.CURDIR}/../../../contrib/dtc
+LIBFDTDIR= ${.CURDIR}/../../../sys/contrib/libfdt
+.PATH: ${DTCDIR} ${LIBFDTDIR} ${DTCDIR}/tests
 
 PROG=	dtc
 
@@ -11,7 +12,7 @@
 	fdt_sw.c fdt_wip.c $(DTCDIR)/version_gen.h
 
 CFLAGS = -Wall -g -Os -fPIC -Wpointer-arith -Wcast-qual
-CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${DTCDIR}/libfdt
+CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${LIBFDTDIR}
 
 VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' $(DTCDIR)/Makefile
 VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' $(DTCDIR)/Makefile

==== //depot/projects/fdt/sys/boot/fdt/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../contrib/dtc/libfdt/
+.PATH:		${.CURDIR}/../../contrib/libfdt/
 
 LIB=		fdt
 INTERNALLIB=
@@ -9,7 +9,7 @@
 
 #CFLAGS+=	-I${.CURDIR}/../common -I${.CURDIR}/../.. -I.
 #CFLAGS+=	-I${.CURDIR}/../../../lib/libstand
-CFLAGS+=	-I${.CURDIR}/../../contrib/dtc/libfdt/
+CFLAGS+=	-I${.CURDIR}/../../contrib/libfdt/
 
 CFLAGS+=	-ffreestanding
 

==== //depot/projects/fdt/sys/boot/uboot/lib/Makefile#3 (text+ko) ====

@@ -14,7 +14,7 @@
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
 
 # Pick up FDT includes
-CFLAGS+=	-I${.CURDIR}/../../../../sys/contrib/dtc/libfdt/
+CFLAGS+=	-I${.CURDIR}/../../../../sys/contrib/libfdt/
 
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.

==== //depot/projects/fdt/sys/conf/Makefile.arm#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .endif
 .include "$S/conf/kern.pre.mk"
 
-INCLUDES+= -I$S/contrib/dtc/libfdt
+INCLUDES+= -I$S/contrib/libfdt
 
 SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M}
 SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M}

==== //depot/projects/fdt/sys/conf/Makefile.powerpc#3 (text+ko) ====

@@ -32,7 +32,7 @@
 
 CFLAGS+= -msoft-float
 
-INCLUDES+= -I$S/contrib/dtc/libfdt
+INCLUDES+= -I$S/contrib/libfdt
 
 DDB_ENABLED!=	grep DDB opt_ddb.h || true
 .if !empty(DDB_ENABLED)

==== //depot/projects/fdt/sys/conf/files#14 (text+ko) ====

@@ -299,6 +299,12 @@
 	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
 contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/libfdt/fdt.c			optional	fdt
+contrib/libfdt/fdt_ro.c			optional	fdt
+contrib/libfdt/fdt_rw.c			optional	fdt
+contrib/libfdt/fdt_strerror.c		optional	fdt
+contrib/libfdt/fdt_sw.c			optional	fdt
+contrib/libfdt/fdt_wip.c		optional	fdt
 contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
@@ -955,6 +961,9 @@
 dev/exca/exca.c			optional cbb
 dev/fatm/if_fatm.c		optional fatm pci
 dev/fb/splash.c			optional splash
+dev/fdt/fdt_common.c		optional	fdt
+dev/fdt/fdtbus.c		optional	fdt
+dev/fdt/simplebus.c		optional	fdt
 dev/fe/if_fe.c			optional fe
 dev/fe/if_fe_pccard.c		optional fe pccard
 dev/firewire/firewire.c		optional firewire

==== //depot/projects/fdt/sys/conf/files.arm#5 (text+ko) ====

@@ -47,16 +47,7 @@
 arm/fpe-arm/armfpe_glue.S	optional	armfpe
 arm/fpe-arm/armfpe_init.c	optional	armfpe
 arm/fpe-arm/armfpe.S		optional	armfpe
-contrib/dtc/libfdt/fdt.c	optional	fdt
-contrib/dtc/libfdt/fdt_ro.c	optional	fdt
-contrib/dtc/libfdt/fdt_rw.c	optional	fdt
-contrib/dtc/libfdt/fdt_strerror.c	optional	fdt
-contrib/dtc/libfdt/fdt_sw.c	optional	fdt
-contrib/dtc/libfdt/fdt_wip.c	optional	fdt
 dev/fdt/fdt_arm.c		optional	fdt
-dev/fdt/fdt_common.c		optional	fdt
-dev/fdt/fdtbus.c		optional	fdt
-dev/fdt/simplebus.c		optional	fdt
 dev/hwpmc/hwpmc_arm.c		optional	hwpmc
 dev/ofw/openfirm.c		optional	fdt
 dev/ofw/openfirmio.c		optional	fdt

==== //depot/projects/fdt/sys/conf/files.powerpc#18 (text+ko) ====

@@ -14,13 +14,6 @@
 	no-obj no-implicit-rule before-depend				\
 	clean	"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 #
-
-contrib/dtc/libfdt/fdt.c	optional	fdt
-contrib/dtc/libfdt/fdt_ro.c	optional	fdt
-contrib/dtc/libfdt/fdt_rw.c	optional	fdt
-contrib/dtc/libfdt/fdt_strerror.c	optional	fdt
-contrib/dtc/libfdt/fdt_sw.c	optional	fdt
-contrib/dtc/libfdt/fdt_wip.c	optional	fdt
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/bm/if_bm.c			optional	bm powermac
@@ -31,10 +24,7 @@
 dev/adb/adb_if.m		optional	adb
 dev/cfi/cfi_bus_fdt.c		optional	cfi fdt
 dev/fb/fb.c			optional	sc
-dev/fdt/fdt_common.c		optional	fdt
 dev/fdt/fdt_powerpc.c		optional	fdt
-dev/fdt/fdtbus.c		optional	fdt
-dev/fdt/simplebus.c		optional	fdt
 dev/hwpmc/hwpmc_powerpc.c	optional	hwpmc
 dev/kbd/kbd.c			optional	sc
 dev/ofw/openfirm.c		optional	aim | fdt

==== //depot/projects/fdt/sys/dev/fdt/fdt_common.h#7 (text+ko) ====

@@ -30,7 +30,7 @@
 #ifndef _FDT_COMMON_H_
 #define _FDT_COMMON_H_
 
-#include "../../contrib/dtc/libfdt/libfdt_env.h"
+#include <contrib/libfdt/libfdt_env.h>
 #include <dev/ofw/ofw_bus.h>
 
 #define DI_MAX_INTR_NUM	8

==== //depot/projects/fdt/sys/dev/ofw/ofw_fdt.c#5 (text+ko) ====

@@ -35,7 +35,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <contrib/dtc/libfdt/libfdt.h>
+#include <contrib/libfdt/libfdt.h>
 
 #include <machine/stdarg.h>

More information about the p4-projects mailing list