Author: imp
Date: Fri Feb 28 18:29:09 2014
New Revision: 262614
URL: http://svnweb.freebsd.org/changeset/base/262614
Log:
Integrate device-tree upstream files into the build process:
(1) Invoke cpp to bring in files via #include (although the old
/include/ stuff is supported still).
(2) bring in files from either vendor tree or freebsd-custom files
when building.
(3) move all dts* files from sys/boot/fdt/dts to
sys/boot/fdt/dts/${MACHINE} as appropriate.
(4) encode all the magic to do the build in sys/tools/fdt/make_dtb.sh
so that the different places in the tree use the exact same logic.
(5) switch back to gpl dtc by default. the bsdl one in the tree has
significant issues not easily addressed by those unfamiliar with
the code.
Added:
head/sys/boot/fdt/dts/arm/
head/sys/boot/fdt/dts/arm/am335x-evm.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/am335x-evm.dts
head/sys/boot/fdt/dts/arm/am335x.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/am335x.dtsi
head/sys/boot/fdt/dts/arm/bcm2835.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/bcm2835.dtsi
head/sys/boot/fdt/dts/arm/beaglebone-black.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/beaglebone-black.dts
head/sys/boot/fdt/dts/arm/beaglebone.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/beaglebone.dts
head/sys/boot/fdt/dts/arm/cubieboard.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/cubieboard.dts
head/sys/boot/fdt/dts/arm/cubieboard2.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/cubieboard2.dts
head/sys/boot/fdt/dts/arm/db78100.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/db78100.dts
head/sys/boot/fdt/dts/arm/db78460.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/db78460.dts
head/sys/boot/fdt/dts/arm/db88f5182.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/db88f5182.dts
head/sys/boot/fdt/dts/arm/db88f5281.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/db88f5281.dts
head/sys/boot/fdt/dts/arm/db88f6281.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/db88f6281.dts
head/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/digi-ccwmx53.dts
head/sys/boot/fdt/dts/arm/dockstar.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/dockstar.dts
head/sys/boot/fdt/dts/arm/dreamplug-1001.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/dreamplug-1001.dts
head/sys/boot/fdt/dts/arm/dreamplug-1001N.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/dreamplug-1001N.dts
head/sys/boot/fdt/dts/arm/ea3250.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/ea3250.dts
head/sys/boot/fdt/dts/arm/efikamx.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/efikamx.dts
head/sys/boot/fdt/dts/arm/exynos5250-arndale.dts
- copied, changed from r262613,
head/sys/boot/fdt/dts/exynos5250-arndale.dts
head/sys/boot/fdt/dts/arm/exynos5250.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/exynos5250.dtsi
head/sys/boot/fdt/dts/arm/imx51x.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/imx51x.dtsi
head/sys/boot/fdt/dts/arm/imx53-qsb.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/imx53-qsb.dts
head/sys/boot/fdt/dts/arm/imx53x.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/imx53x.dtsi
head/sys/boot/fdt/dts/arm/imx6.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/imx6.dtsi
head/sys/boot/fdt/dts/arm/p1020rdb.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/p1020rdb.dts
head/sys/boot/fdt/dts/arm/p2020ds.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/p2020ds.dts
head/sys/boot/fdt/dts/arm/p2041rdb.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/p2041rdb.dts
head/sys/boot/fdt/dts/arm/p2041si.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/p2041si.dtsi
head/sys/boot/fdt/dts/arm/p3041ds.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/p3041ds.dts
head/sys/boot/fdt/dts/arm/p3041si.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/p3041si.dtsi
head/sys/boot/fdt/dts/arm/p5020ds.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/p5020ds.dts
head/sys/boot/fdt/dts/arm/p5020si.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/p5020si.dtsi
head/sys/boot/fdt/dts/arm/pandaboard.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/pandaboard.dts
head/sys/boot/fdt/dts/arm/rk3188-radxa.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/rk3188-radxa.dts
head/sys/boot/fdt/dts/arm/rk3188.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/rk3188.dtsi
head/sys/boot/fdt/dts/arm/rpi.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/rpi.dts
head/sys/boot/fdt/dts/arm/sheevaplug.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/sheevaplug.dts
head/sys/boot/fdt/dts/arm/tegra20-paz00.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/tegra20-paz00.dts
head/sys/boot/fdt/dts/arm/tegra20.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/tegra20.dtsi
head/sys/boot/fdt/dts/arm/trimslice.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/trimslice.dts
head/sys/boot/fdt/dts/arm/ts7800.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/ts7800.dts
head/sys/boot/fdt/dts/arm/versatilepb.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/versatilepb.dts
head/sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts
- copied, changed from r262613,
head/sys/boot/fdt/dts/vybrid-colibri-vf50.dts
head/sys/boot/fdt/dts/arm/vybrid-cosmic.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/vybrid-cosmic.dts
head/sys/boot/fdt/dts/arm/vybrid-quartz.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/vybrid-quartz.dts
head/sys/boot/fdt/dts/arm/vybrid.dtsi
- copied, changed from r262613, head/sys/boot/fdt/dts/vybrid.dtsi
head/sys/boot/fdt/dts/arm/wandboard-dual.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/wandboard-dual.dts
head/sys/boot/fdt/dts/arm/wandboard-quad.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/wandboard-quad.dts
head/sys/boot/fdt/dts/arm/wandboard-solo.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/wandboard-solo.dts
head/sys/boot/fdt/dts/arm/zedboard.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/zedboard.dts
head/sys/boot/fdt/dts/mips/
head/sys/boot/fdt/dts/mips/beri-netfpga.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/beri-netfpga.dts
head/sys/boot/fdt/dts/mips/beri-sim.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/beri-sim.dts
head/sys/boot/fdt/dts/mips/beripad-de4.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/beripad-de4.dts
head/sys/boot/fdt/dts/mips/xlp-basic.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/xlp-basic.dts
head/sys/boot/fdt/dts/powerpc/
head/sys/boot/fdt/dts/powerpc/mpc8555cds.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/mpc8555cds.dts
head/sys/boot/fdt/dts/powerpc/mpc8572ds.dts
- copied, changed from r262613, head/sys/boot/fdt/dts/mpc8572ds.dts
head/sys/tools/fdt/make_dtb.sh (contents, props changed)
Deleted:
head/sys/boot/fdt/dts/am335x-evm.dts
head/sys/boot/fdt/dts/am335x.dtsi
head/sys/boot/fdt/dts/bcm2835.dtsi
head/sys/boot/fdt/dts/beaglebone-black.dts
head/sys/boot/fdt/dts/beaglebone.dts
head/sys/boot/fdt/dts/beri-netfpga.dts
head/sys/boot/fdt/dts/beri-sim.dts
head/sys/boot/fdt/dts/beripad-de4.dts
head/sys/boot/fdt/dts/cubieboard.dts
head/sys/boot/fdt/dts/cubieboard2.dts
head/sys/boot/fdt/dts/db78100.dts
head/sys/boot/fdt/dts/db78460.dts
head/sys/boot/fdt/dts/db88f5182.dts
head/sys/boot/fdt/dts/db88f5281.dts
head/sys/boot/fdt/dts/db88f6281.dts
head/sys/boot/fdt/dts/digi-ccwmx53.dts
head/sys/boot/fdt/dts/dockstar.dts
head/sys/boot/fdt/dts/dreamplug-1001.dts
head/sys/boot/fdt/dts/dreamplug-1001N.dts
head/sys/boot/fdt/dts/ea3250.dts
head/sys/boot/fdt/dts/efikamx.dts
head/sys/boot/fdt/dts/exynos5250-arndale.dts
head/sys/boot/fdt/dts/exynos5250.dtsi
head/sys/boot/fdt/dts/imx51x.dtsi
head/sys/boot/fdt/dts/imx53-qsb.dts
head/sys/boot/fdt/dts/imx53x.dtsi
head/sys/boot/fdt/dts/imx6.dtsi
head/sys/boot/fdt/dts/mpc8555cds.dts
head/sys/boot/fdt/dts/mpc8572ds.dts
head/sys/boot/fdt/dts/p1020rdb.dts
head/sys/boot/fdt/dts/p2020ds.dts
head/sys/boot/fdt/dts/p2041rdb.dts
head/sys/boot/fdt/dts/p2041si.dtsi
head/sys/boot/fdt/dts/p3041ds.dts
head/sys/boot/fdt/dts/p3041si.dtsi
head/sys/boot/fdt/dts/p5020ds.dts
head/sys/boot/fdt/dts/p5020si.dtsi
head/sys/boot/fdt/dts/pandaboard.dts
head/sys/boot/fdt/dts/rk3188-radxa.dts
head/sys/boot/fdt/dts/rk3188.dtsi
head/sys/boot/fdt/dts/rpi.dts
head/sys/boot/fdt/dts/sheevaplug.dts
head/sys/boot/fdt/dts/tegra20-paz00.dts
head/sys/boot/fdt/dts/tegra20.dtsi
head/sys/boot/fdt/dts/trimslice.dts
head/sys/boot/fdt/dts/ts7800.dts
head/sys/boot/fdt/dts/versatilepb.dts
head/sys/boot/fdt/dts/vybrid-colibri-vf50.dts
head/sys/boot/fdt/dts/vybrid-cosmic.dts
head/sys/boot/fdt/dts/vybrid-quartz.dts
head/sys/boot/fdt/dts/vybrid.dtsi
head/sys/boot/fdt/dts/wandboard-dual.dts
head/sys/boot/fdt/dts/wandboard-quad.dts
head/sys/boot/fdt/dts/wandboard-solo.dts
head/sys/boot/fdt/dts/xlp-basic.dts
head/sys/boot/fdt/dts/zedboard.dts
Modified:
head/Makefile.inc1
head/share/mk/bsd.own.mk
head/sys/conf/files
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Fri Feb 28 18:06:00 2014 (r262613)
+++ head/Makefile.inc1 Fri Feb 28 18:29:09 2014 (r262614)
@@ -1262,7 +1262,7 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/
lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
.endif
-# Default to building the BSDL DTC, but build the GPL one if users explicitly
+# Default to building the GPL DTC, but build the BSDL one if users explicitly
# request it.
_dtc= usr.bin/dtc
.if ${MK_GPL_DTC} != "no"
@@ -1853,7 +1853,7 @@ builddtb:
echo "ERROR: FDT_DTS_FILE must be specified!"; \
exit 1; \
fi; \
- if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
+ if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE} ];
then \
echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
exist!"; \
exit 1; \
@@ -1863,9 +1863,9 @@ builddtb:
directory"; \
fi
@PATH=${TMPPATH} \
- dtc -O dtb -o \
- ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
- -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}
+ ${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
+ ${FDT_DTS_FILE} \
+ ${DTBOUTPUTPATH}/`basename ${FDT_DTS_FILE} .dts`
###############
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Fri Feb 28 18:06:00 2014 (r262613)
+++ head/share/mk/bsd.own.mk Fri Feb 28 18:29:09 2014 (r262614)
@@ -287,6 +287,7 @@ __DEFAULT_YES_OPTIONS = \
GNU \
GPIB \
GPIO \
+ GPL_DTC \
GROFF \
HTML \
ICONV \
@@ -368,7 +369,6 @@ __DEFAULT_NO_OPTIONS = \
CLANG_EXTRAS \
CTF \
DEBUG_FILES \
- GPL_DTC \
HESIOD \
INSTALL_AS_USER \
LLDB \
Copied and modified: head/sys/boot/fdt/dts/arm/am335x-evm.dts (from r262613,
head/sys/boot/fdt/dts/am335x-evm.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/am335x.dtsi (from r262613,
head/sys/boot/fdt/dts/am335x.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/bcm2835.dtsi (from r262613,
head/sys/boot/fdt/dts/bcm2835.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/beaglebone-black.dts (from
r262613, head/sys/boot/fdt/dts/beaglebone-black.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/beaglebone.dts (from r262613,
head/sys/boot/fdt/dts/beaglebone.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/cubieboard.dts (from r262613,
head/sys/boot/fdt/dts/cubieboard.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/cubieboard2.dts (from r262613,
head/sys/boot/fdt/dts/cubieboard2.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/db78100.dts (from r262613,
head/sys/boot/fdt/dts/db78100.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/db78460.dts (from r262613,
head/sys/boot/fdt/dts/db78460.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/db88f5182.dts (from r262613,
head/sys/boot/fdt/dts/db88f5182.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/db88f5281.dts (from r262613,
head/sys/boot/fdt/dts/db88f5281.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/db88f6281.dts (from r262613,
head/sys/boot/fdt/dts/db88f6281.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/digi-ccwmx53.dts (from r262613,
head/sys/boot/fdt/dts/digi-ccwmx53.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/dockstar.dts (from r262613,
head/sys/boot/fdt/dts/dockstar.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/dreamplug-1001.dts (from
r262613, head/sys/boot/fdt/dts/dreamplug-1001.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/dreamplug-1001N.dts (from
r262613, head/sys/boot/fdt/dts/dreamplug-1001N.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/ea3250.dts (from r262613,
head/sys/boot/fdt/dts/ea3250.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/efikamx.dts (from r262613,
head/sys/boot/fdt/dts/efikamx.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/exynos5250-arndale.dts (from
r262613, head/sys/boot/fdt/dts/exynos5250-arndale.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/exynos5250.dtsi (from r262613,
head/sys/boot/fdt/dts/exynos5250.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/imx51x.dtsi (from r262613,
head/sys/boot/fdt/dts/imx51x.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/imx53-qsb.dts (from r262613,
head/sys/boot/fdt/dts/imx53-qsb.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/imx53x.dtsi (from r262613,
head/sys/boot/fdt/dts/imx53x.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/imx6.dtsi (from r262613,
head/sys/boot/fdt/dts/imx6.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/p1020rdb.dts (from r262613,
head/sys/boot/fdt/dts/p1020rdb.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/p2020ds.dts (from r262613,
head/sys/boot/fdt/dts/p2020ds.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/p2041rdb.dts (from r262613,
head/sys/boot/fdt/dts/p2041rdb.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/p2041si.dtsi (from r262613,
head/sys/boot/fdt/dts/p2041si.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/p3041ds.dts (from r262613,
head/sys/boot/fdt/dts/p3041ds.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/p3041si.dtsi (from r262613,
head/sys/boot/fdt/dts/p3041si.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/p5020ds.dts (from r262613,
head/sys/boot/fdt/dts/p5020ds.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/p5020si.dtsi (from r262613,
head/sys/boot/fdt/dts/p5020si.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/pandaboard.dts (from r262613,
head/sys/boot/fdt/dts/pandaboard.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/rk3188-radxa.dts (from r262613,
head/sys/boot/fdt/dts/rk3188-radxa.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/rk3188.dtsi (from r262613,
head/sys/boot/fdt/dts/rk3188.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/rpi.dts (from r262613,
head/sys/boot/fdt/dts/rpi.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/sheevaplug.dts (from r262613,
head/sys/boot/fdt/dts/sheevaplug.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/tegra20-paz00.dts (from r262613,
head/sys/boot/fdt/dts/tegra20-paz00.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/tegra20.dtsi (from r262613,
head/sys/boot/fdt/dts/tegra20.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/trimslice.dts (from r262613,
head/sys/boot/fdt/dts/trimslice.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/ts7800.dts (from r262613,
head/sys/boot/fdt/dts/ts7800.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/versatilepb.dts (from r262613,
head/sys/boot/fdt/dts/versatilepb.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/vybrid-colibri-vf50.dts (from
r262613, head/sys/boot/fdt/dts/vybrid-colibri-vf50.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/vybrid-cosmic.dts (from r262613,
head/sys/boot/fdt/dts/vybrid-cosmic.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/vybrid-quartz.dts (from r262613,
head/sys/boot/fdt/dts/vybrid-quartz.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/vybrid.dtsi (from r262613,
head/sys/boot/fdt/dts/vybrid.dtsi)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/wandboard-dual.dts (from
r262613, head/sys/boot/fdt/dts/wandboard-dual.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/wandboard-quad.dts (from
r262613, head/sys/boot/fdt/dts/wandboard-quad.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/wandboard-solo.dts (from
r262613, head/sys/boot/fdt/dts/wandboard-solo.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/arm/zedboard.dts (from r262613,
head/sys/boot/fdt/dts/zedboard.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/mips/beri-netfpga.dts (from r262613,
head/sys/boot/fdt/dts/beri-netfpga.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/mips/beri-sim.dts (from r262613,
head/sys/boot/fdt/dts/beri-sim.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/mips/beripad-de4.dts (from r262613,
head/sys/boot/fdt/dts/beripad-de4.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/mips/xlp-basic.dts (from r262613,
head/sys/boot/fdt/dts/xlp-basic.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/powerpc/mpc8555cds.dts (from
r262613, head/sys/boot/fdt/dts/mpc8555cds.dts)
==============================================================================
Copied and modified: head/sys/boot/fdt/dts/powerpc/mpc8572ds.dts (from r262613,
head/sys/boot/fdt/dts/mpc8572ds.dts)
==============================================================================
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Fri Feb 28 18:06:00 2014 (r262613)
+++ head/sys/conf/files Fri Feb 28 18:29:09 2014 (r262614)
@@ -14,11 +14,12 @@ acpi_quirks.h optional acpi
\
# from the specified source (DTS) file: <platform>.dts -> <platform>.dtb
#
fdt_dtb_file optional fdt \
- compile-with "if [ -f $S/boot/fdt/dts/${FDT_DTS_FILE} ]; then dtc -O
dtb -o ${FDT_DTS_FILE:R}.dtb -b 0 -p 1024 $S/boot/fdt/dts/${FDT_DTS_FILE}; fi" \
+ compile-with "sh $S/tools/fdt/make_dtb.sh $S ${FDT_DTS_FILE}
${.CURDIR}/${FDT_DTS_FILE:R}.dtb" \
no-obj no-implicit-rule before-depend \
clean "${FDT_DTS_FILE:R}.dtb"
fdt_static_dtb.h optional fdt fdt_dtb_static \
- compile-with "sh $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ." \
+ compile-with "sh $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.CURDIR}" \
+ dependency "fdt_dtb_file" \
no-obj no-implicit-rule before-depend \
clean "fdt_static_dtb.h"
feeder_eq_gen.h optional sound
\
@@ -1370,7 +1371,7 @@ dev/fb/splash.c optional sc splash
dev/fdt/fdt_common.c optional fdt
dev/fdt/fdt_slicer.c optional fdt cfi | fdt nand
dev/fdt/fdt_static_dtb.S optional fdt fdt_dtb_static \
- dependency "$S/boot/fdt/dts/${FDT_DTS_FILE}"
+ dependency "$S/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE}"
dev/fdt/simplebus.c optional fdt
dev/fe/if_fe.c optional fe
dev/fe/if_fe_pccard.c optional fe pccard
Added: head/sys/tools/fdt/make_dtb.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/tools/fdt/make_dtb.sh Fri Feb 28 18:29:09 2014
(r262614)
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+# Script generates dtb file ($3) from dts source ($2) in build tree S ($1)
+S=$1
+dts=$2
+dtb=$3
+
+cpp -x assembler-with-cpp -I $S/gnu/dts/include -I $S/boot/fdt/dts/${MACHINE}
-I $S/gnu/dts/${MACHINE} -include $dts /dev/null |
+ dtc -O dtb -o $dtb -b 0 -p 1024 -i $S/boot/fdt/dts -i
$S/gnu/dts/${MACHINE}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
