PERFORCE change 171291 for review

[Rafal Jaworowski]

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

Change 171291 by raj at raj_fdt on 2009/12/02 19:04:07

	Integrate libfdt code into kernel image. Enable FDT support code for
	MPC85XX kernel.

Affected files ...

.. //depot/projects/fdt/sys/conf/Makefile.powerpc#2 edit
.. //depot/projects/fdt/sys/conf/files.powerpc#2 edit
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_env.h#2 edit
.. //depot/projects/fdt/sys/powerpc/conf/MPC85XX#2 edit

Differences ...

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

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

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

@@ -15,6 +15,12 @@
 	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
@@ -63,6 +69,7 @@
 libkern/fls.c			standard
 libkern/flsl.c			standard
 libkern/lshrdi3.c		standard
+libkern/memchr.c		optional	fdt
 libkern/memmove.c		standard
 libkern/memset.c		standard
 libkern/moddi3.c		standard

==== //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_env.h#2 (text+ko) ====

@@ -1,9 +1,17 @@
 #ifndef _LIBFDT_ENV_H
 #define _LIBFDT_ENV_H
 
+#ifdef _KERNEL
+#include <sys/cdefs.h>                                                          
+#include <sys/param.h>                                                          
+#include <sys/types.h>                                                          
+#include <sys/systm.h>
+#include <sys/stdint.h>
+#else
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
+#endif
 
 #define _B(n)	((unsigned long long)((uint8_t *)&x)[n])
 static inline uint32_t fdt32_to_cpu(uint32_t x)

==== //depot/projects/fdt/sys/powerpc/conf/MPC85XX#2 (text+ko) ====

@@ -25,6 +25,7 @@
 options 	DEVICE_POLLING
 options 	HZ=1000
 #options 	DIAGNOSTIC
+options		FDT
 options 	FFS
 options 	GDB
 options 	GEOM_PART_GPT