diff options
| author | imp <imp@FreeBSD.org> | 2014-02-28 18:29:09 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-02-28 18:29:09 +0000 |
| commit | 7c37cf4f64a8b60173836f7982a52d237f80331d (patch) | |
| tree | a108ed945633a610d53d8813406306de44eca8c0 /Makefile.inc1 | |
| parent | 65a6006c96564a609fd04df91eb0f897570e8040 (diff) | |
| download | FreeBSD-src-7c37cf4f64a8b60173836f7982a52d237f80331d.zip FreeBSD-src-7c37cf4f64a8b60173836f7982a52d237f80331d.tar.gz | |
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.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 00d0a9f..2f22759 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1262,7 +1262,7 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ 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` ############### |
