svn commit: r266251 - in stable/10: . share/mk sys/boot/fdt/dts sys/boot/fdt/dts/arm sys/boot/fdt/dts/mips sys/boot/fdt/dts/powerpc sys/conf sys/tools/fdt
Ian Lepore
ian at FreeBSD.org
Fri May 16 15:56:38 UTC 2014
Author: ian
Date: Fri May 16 15:56:34 2014
New Revision: 266251
URL: http://svnweb.freebsd.org/changeset/base/266251
Log:
MFC 262614, 262625, 262626, 262627, 262682, 262714, 262725, 262736
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.
Only try to build the static dtb when we're building a static dtb.
Use proper include path for dtc as well as cpp.
Fix syntax errors (missing ; other minor glitches) in existing dts files.
Added:
stable/10/sys/boot/fdt/dts/arm/
- copied from r262614, head/sys/boot/fdt/dts/arm/
stable/10/sys/boot/fdt/dts/mips/
- copied from r262614, head/sys/boot/fdt/dts/mips/
stable/10/sys/boot/fdt/dts/powerpc/
- copied from r262614, head/sys/boot/fdt/dts/powerpc/
stable/10/sys/tools/fdt/make_dtb.sh (contents, props changed)
- copied, changed from r262614, head/sys/tools/fdt/make_dtb.sh
Deleted:
stable/10/sys/boot/fdt/dts/am335x-evm.dts
stable/10/sys/boot/fdt/dts/am335x.dtsi
stable/10/sys/boot/fdt/dts/bcm2835.dtsi
stable/10/sys/boot/fdt/dts/beaglebone-black.dts
stable/10/sys/boot/fdt/dts/beaglebone.dts
stable/10/sys/boot/fdt/dts/beri-netfpga.dts
stable/10/sys/boot/fdt/dts/beri-sim.dts
stable/10/sys/boot/fdt/dts/beripad-de4.dts
stable/10/sys/boot/fdt/dts/cubieboard.dts
stable/10/sys/boot/fdt/dts/cubieboard2.dts
stable/10/sys/boot/fdt/dts/db78100.dts
stable/10/sys/boot/fdt/dts/db78460.dts
stable/10/sys/boot/fdt/dts/db88f5182.dts
stable/10/sys/boot/fdt/dts/db88f5281.dts
stable/10/sys/boot/fdt/dts/db88f6281.dts
stable/10/sys/boot/fdt/dts/digi-ccwmx53.dts
stable/10/sys/boot/fdt/dts/dockstar.dts
stable/10/sys/boot/fdt/dts/dreamplug-1001.dts
stable/10/sys/boot/fdt/dts/dreamplug-1001N.dts
stable/10/sys/boot/fdt/dts/ea3250.dts
stable/10/sys/boot/fdt/dts/efikamx.dts
stable/10/sys/boot/fdt/dts/exynos5250-arndale.dts
stable/10/sys/boot/fdt/dts/exynos5250.dtsi
stable/10/sys/boot/fdt/dts/imx51x.dtsi
stable/10/sys/boot/fdt/dts/imx53-qsb.dts
stable/10/sys/boot/fdt/dts/imx53x.dtsi
stable/10/sys/boot/fdt/dts/imx6.dtsi
stable/10/sys/boot/fdt/dts/mpc8555cds.dts
stable/10/sys/boot/fdt/dts/mpc8572ds.dts
stable/10/sys/boot/fdt/dts/p1020rdb.dts
stable/10/sys/boot/fdt/dts/p2020ds.dts
stable/10/sys/boot/fdt/dts/p2041rdb.dts
stable/10/sys/boot/fdt/dts/p2041si.dtsi
stable/10/sys/boot/fdt/dts/p3041ds.dts
stable/10/sys/boot/fdt/dts/p3041si.dtsi
stable/10/sys/boot/fdt/dts/p5020ds.dts
stable/10/sys/boot/fdt/dts/p5020si.dtsi
stable/10/sys/boot/fdt/dts/pandaboard.dts
stable/10/sys/boot/fdt/dts/rk3188-radxa.dts
stable/10/sys/boot/fdt/dts/rk3188.dtsi
stable/10/sys/boot/fdt/dts/rpi.dts
stable/10/sys/boot/fdt/dts/sheevaplug.dts
stable/10/sys/boot/fdt/dts/tegra20-paz00.dts
stable/10/sys/boot/fdt/dts/tegra20.dtsi
stable/10/sys/boot/fdt/dts/trimslice.dts
stable/10/sys/boot/fdt/dts/ts7800.dts
stable/10/sys/boot/fdt/dts/versatilepb.dts
stable/10/sys/boot/fdt/dts/vybrid-colibri-vf50.dts
stable/10/sys/boot/fdt/dts/vybrid-cosmic.dts
stable/10/sys/boot/fdt/dts/vybrid-quartz.dts
stable/10/sys/boot/fdt/dts/vybrid.dtsi
stable/10/sys/boot/fdt/dts/wandboard-dual.dts
stable/10/sys/boot/fdt/dts/wandboard-quad.dts
stable/10/sys/boot/fdt/dts/wandboard-solo.dts
stable/10/sys/boot/fdt/dts/xlp-basic.dts
stable/10/sys/boot/fdt/dts/zedboard.dts
Modified:
stable/10/Makefile.inc1
stable/10/share/mk/bsd.own.mk
stable/10/sys/boot/fdt/dts/arm/beaglebone-black.dts
stable/10/sys/boot/fdt/dts/arm/beaglebone.dts
stable/10/sys/boot/fdt/dts/arm/imx53-qsb.dts
stable/10/sys/boot/fdt/dts/arm/imx53x.dtsi
stable/10/sys/boot/fdt/dts/arm/imx6.dtsi
stable/10/sys/boot/fdt/dts/arm/rk3188.dtsi
stable/10/sys/boot/fdt/dts/arm/rpi.dts
stable/10/sys/boot/fdt/dts/mips/beri-netfpga.dts
stable/10/sys/boot/fdt/dts/mips/beri-sim.dts
stable/10/sys/boot/fdt/dts/mips/beripad-de4.dts
stable/10/sys/conf/files
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1 Fri May 16 15:56:07 2014 (r266250)
+++ stable/10/Makefile.inc1 Fri May 16 15:56:34 2014 (r266251)
@@ -1266,7 +1266,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"
@@ -1849,7 +1849,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; \
@@ -1859,9 +1859,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: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk Fri May 16 15:56:07 2014 (r266250)
+++ stable/10/share/mk/bsd.own.mk Fri May 16 15:56:34 2014 (r266251)
@@ -285,6 +285,7 @@ __DEFAULT_YES_OPTIONS = \
GNU \
GPIB \
GPIO \
+ GPL_DTC \
GROFF \
HTML \
ICONV \
@@ -367,7 +368,6 @@ __DEFAULT_NO_OPTIONS = \
CLANG_EXTRAS \
CTF \
DEBUG_FILES \
- GPL_DTC \
HESIOD \
INSTALL_AS_USER \
LLDB \
Modified: stable/10/sys/boot/fdt/dts/arm/beaglebone-black.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/beaglebone-black.dts Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/arm/beaglebone-black.dts Fri May 16 15:56:34 2014 (r266251)
@@ -150,7 +150,7 @@
compatible = "ti,am335x-pmic";
reg = <0x24>;
};
- }
+ };
};
leds {
Modified: stable/10/sys/boot/fdt/dts/arm/beaglebone.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/beaglebone.dts Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/arm/beaglebone.dts Fri May 16 15:56:34 2014 (r266251)
@@ -135,7 +135,7 @@
compatible = "ti,am335x-pmic";
reg = <0x24>;
};
- }
+ };
};
chosen {
Modified: stable/10/sys/boot/fdt/dts/arm/imx53-qsb.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/imx53-qsb.dts Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/arm/imx53-qsb.dts Fri May 16 15:56:34 2014 (r266251)
@@ -105,7 +105,7 @@
ethernet at 63fec000 {
status = "okay";
phy-mode = "rmii";
- }
+ };
i2c at 63fc4000 {
status = "okay";
};
Modified: stable/10/sys/boot/fdt/dts/arm/imx53x.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/imx53x.dtsi Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/arm/imx53x.dtsi Fri May 16 15:56:34 2014 (r266251)
@@ -95,7 +95,7 @@
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&tzic>;
- ranges = <0x50000000 0x14000000>;
+ ranges;
aips at 50000000 { /* AIPS1 */
compatible = "fsl,aips-bus", "simple-bus";
Modified: stable/10/sys/boot/fdt/dts/arm/imx6.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/imx6.dtsi Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/arm/imx6.dtsi Fri May 16 15:56:34 2014 (r266251)
@@ -99,7 +99,7 @@
reg = <0x020c8000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <49>;
- }
+ };
gpt: timer at 02098000 {
compatible = "fsl,imx6q-gpt", "fsl,imx51-gpt";
@@ -343,7 +343,7 @@
ocotp0: ocotp at 021bc000 {
compatible = "fsl,imx6q-ocotp";
reg = <0x021bc000 0x4000>;
- }
+ };
};
};
};
Modified: stable/10/sys/boot/fdt/dts/arm/rk3188.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/rk3188.dtsi Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/arm/rk3188.dtsi Fri May 16 15:56:34 2014 (r266251)
@@ -77,7 +77,6 @@
timer at 20038000 {
compatible = "rockchip,rk30xx-timer";
- compatible = "rockchip,rk3188-dw-apb-timer-osc";
reg = <0x20038000 0x20>;
interrupts = <76>;
clock-frequency = <24000000>;
Modified: stable/10/sys/boot/fdt/dts/arm/rpi.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/rpi.dts Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/arm/rpi.dts Fri May 16 15:56:34 2014 (r266251)
@@ -28,13 +28,13 @@
/include/ "bcm2835.dtsi"
-/memreserve/ 0x08000000 0x08000000; /* Set by VideoCore */
-
/ {
model = "Raspberry Pi (BCM2835)";
compatible = "raspberrypi,model-a", "raspberrypi,model-b",
"broadcom,bcm2835-vc", "broadcom,bcm2708-vc";
+ memreserve = <0x08000000 0x08000000>; /* Set by VideoCore */
+
memory {
device_type = "memory";
reg = <0 0x8000000>; /* 128MB, Set by VideoCore */
Modified: stable/10/sys/boot/fdt/dts/mips/beri-netfpga.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beri-netfpga.dts Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/mips/beri-netfpga.dts Fri May 16 15:56:34 2014 (r266251)
@@ -66,7 +66,7 @@
device-type = "cpu";
compatible = "sri-cambridge,beri";
- reg = <0>;
+ reg = <0 1>;
status = "okay";
};
@@ -75,7 +75,7 @@
device-type = "cpu";
compatible = "sri-cambridge,beri";
- reg = <1>;
+ reg = <1 1>;
// XXX: should we need cached prefix?
cpu-release-addr = <0xffffffff 0x800fffe0>;
};
Modified: stable/10/sys/boot/fdt/dts/mips/beri-sim.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beri-sim.dts Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/mips/beri-sim.dts Fri May 16 15:56:34 2014 (r266251)
@@ -64,7 +64,7 @@
device-type = "cpu";
compatible = "sri-cambridge,beri";
- reg = <0>;
+ reg = <0 1>;
status = "okay";
};
@@ -73,7 +73,7 @@
device-type = "cpu";
compatible = "sri-cambridge,beri";
- reg = <1>;
+ reg = <1 1>;
// XXX: should we need cached prefix?
cpu-release-addr = <0xffffffff 0x800fffe0>;
};
Modified: stable/10/sys/boot/fdt/dts/mips/beripad-de4.dts
==============================================================================
--- head/sys/boot/fdt/dts/mips/beripad-de4.dts Fri Feb 28 18:29:09 2014 (r262614)
+++ stable/10/sys/boot/fdt/dts/mips/beripad-de4.dts Fri May 16 15:56:34 2014 (r266251)
@@ -64,7 +64,7 @@
device-type = "cpu";
compatible = "sri-cambridge,beri";
- reg = <0>;
+ reg = <0 1>;
status = "okay";
};
@@ -73,7 +73,7 @@
device-type = "cpu";
compatible = "sri-cambridge,beri";
- reg = <1>;
+ reg = <1 1>;
// XXX: should we need cached prefix?
cpu-release-addr = <0xffffffff 0x800fffe0>;
};
Modified: stable/10/sys/conf/files
==============================================================================
--- stable/10/sys/conf/files Fri May 16 15:56:07 2014 (r266250)
+++ stable/10/sys/conf/files Fri May 16 15:56:34 2014 (r266251)
@@ -54,12 +54,13 @@ aic79xx_reg_print.o optional ahd pci ah
# The 'fdt_dtb_file' target covers an actual DTB file name, which is derived
# 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" \
+fdt_dtb_file optional fdt fdt_dtb_static \
+ 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 \
@@ -1406,7 +1407,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
Copied and modified: stable/10/sys/tools/fdt/make_dtb.sh (from r262614, head/sys/tools/fdt/make_dtb.sh)
==============================================================================
--- head/sys/tools/fdt/make_dtb.sh Fri Feb 28 18:29:09 2014 (r262614, copy source)
+++ stable/10/sys/tools/fdt/make_dtb.sh Fri May 16 15:56:34 2014 (r266251)
@@ -8,4 +8,4 @@ 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}
+ dtc -O dtb -o $dtb -b 0 -p 1024 -i $S/boot/fdt/dts/${MACHINE} -i $S/gnu/dts/${MACHINE}
More information about the svn-src-stable-10
mailing list