diff options
author | ian <ian@FreeBSD.org> | 2014-10-27 00:47:55 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2014-10-27 00:47:55 +0000 |
commit | 8f1520bd133cfba0b19d94312e81e5aa5bedfcbe (patch) | |
tree | a9b51dcfa8c4216b3b19dbd316d1c695aaea66f3 /Makefile.inc1 | |
parent | 348b464642751e4ce8fc20685e7ebd86821b51c1 (diff) | |
download | FreeBSD-src-8f1520bd133cfba0b19d94312e81e5aa5bedfcbe.zip FreeBSD-src-8f1520bd133cfba0b19d94312e81e5aa5bedfcbe.tar.gz |
MFC r262626, r262626, r264979, r265154, r265162, r265163, r267319, r270863,
r270991, r271045:
Enhancements related to compiling FDT data...
- Use proper include path for dtc as well as cpp.
- Call cpp with -P to avoid printing line markings.
- Allow FDT_DTS_FILE to be a list, either in the makedtb target, or in a
kernel config file.
- Add the dts include directory to the -I list when doing arm builds.
- Invoke make_dtb with MACHINE defined for cross building friendliness.
- Allow the make_dtb script to work outside of a "make buildkernel"
context by setting MACHINE from uname -m if it's not set already.
- Use sh -c '...' to launch the dtb build scripts with env prepended,
otherwise it tries to treat the env var stuff as a script file name.
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index d4dfd1c..79c9b59 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1871,23 +1871,9 @@ DTBOUTPUTPATH= ${.CURDIR} # Build 'standalone' Device Tree Blob # builddtb: - @if [ "${FDT_DTS_FILE}" = "" ]; then \ - echo "ERROR: FDT_DTS_FILE must be specified!"; \ - exit 1; \ - fi; \ - 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; \ - fi; \ - if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then \ - echo "WARNING: DTB will be placed in the current working \ - directory"; \ - fi - @PATH=${TMPPATH} \ + @PATH=${TMPPATH} MACHINE=${TARGET} \ ${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \ - ${FDT_DTS_FILE} \ - ${DTBOUTPUTPATH}/`basename ${FDT_DTS_FILE} .dts` + "${FDT_DTS_FILE}" ${DTBOUTPUTPATH} ############### |