diff options
| author | ian <ian@FreeBSD.org> | 2014-05-16 15:56:34 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-16 15:56:34 +0000 |
| commit | 6c4033c89f2630952f5b5e5fb6d1a0b35339f2fc (patch) | |
| tree | 9b526206a1fd1a2fa5e6899088c3d5ed20bdb958 /sys/conf | |
| parent | 0e330f2d7031b7b7ac99866fff8db9856635226c (diff) | |
| download | FreeBSD-src-6c4033c89f2630952f5b5e5fb6d1a0b35339f2fc.zip FreeBSD-src-6c4033c89f2630952f5b5e5fb6d1a0b35339f2fc.tar.gz | |
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.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/conf/files b/sys/conf/files index 37173e4..a805743 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -54,12 +54,13 @@ aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ # 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 |
