On Thu, Oct 22, 2015 at 12:34:06PM +0900, Masahiro Yamada wrote: > For the pre-processor to include sources below dts/ directory, > -I$(srctree)/dts/src is specified as an include path. On the other > hand, for the DTC-native, -i $(srctree)/dts/src/$(SRCARCH) is > currently specified. > > Theoretically, the pre-processor style (#include) and DTC-native > style (/include/) should work with the same include paths. > > Currently, there are no users for the latter, so we can fix it safely. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> > --- > > scripts/Makefile.lib | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index e991f33..c529d15 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -258,7 +258,7 @@ quiet_cmd_dtc = DTC $@ > cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ > $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \ > -i $(srctree)/arch/$(SRCARCH)/dts $(DTC_FLAGS) \ > - -i $(srctree)/dts/src/$(SRCARCH) \ > + -i $(srctree)/dts/src/ \ > -d $(depfile).dtc $(dtc-tmp) ; \ > cat $(depfile).pre $(depfile).dtc > $(depfile) Seems there are indeed users for this. This patch breaks these defconfigs: config: arm am335x_defconfig FATAL ERROR: Couldn't open "am33xx-clocks.dtsi": No such file or directory scripts/Makefile.lib:266: recipe for target 'arch/arm/dts/am335x-bone-common.dtb' failed make[1]: *** [arch/arm/dts/am335x-bone-common.dtb] Error 1 make[1]: *** Waiting for unfinished jobs.... FATAL ERROR: Couldn't open "am33xx-clocks.dtsi": No such file or directory scripts/Makefile.lib:266: recipe for target 'arch/arm/dts/am335x-afi-gf.dtb' failed make[1]: *** [arch/arm/dts/am335x-afi-gf.dtb] Error 1 Makefile:772: recipe for target 'arch/arm/dts' failed make: *** [arch/arm/dts] Error 2 make: *** Waiting for unfinished jobs.... config: arm am335x_mlo_defconfig FATAL ERROR: Couldn't open "am33xx-clocks.dtsi": No such file or directory scripts/Makefile.lib:266: recipe for target 'arch/arm/dts/am335x-afi-gf.dtb' failed make[1]: *** [arch/arm/dts/am335x-afi-gf.dtb] Error 1 make[1]: *** Waiting for unfinished jobs.... FATAL ERROR: Couldn't open "am33xx-clocks.dtsi": No such file or directory scripts/Makefile.lib:266: recipe for target 'arch/arm/dts/am335x-bone-common.dtb' failed make[1]: *** [arch/arm/dts/am335x-bone-common.dtb] Error 1 Makefile:772: recipe for target 'arch/arm/dts' failed make: *** [arch/arm/dts] Error 2 make: *** Waiting for unfinished jobs.... config: arm mvebu_defconfig FATAL ERROR: Couldn't open "skeleton64.dtsi": No such file or directory scripts/Makefile.lib:266: recipe for target 'arch/arm/dts/armada-xp-gp-bb.dtb' failed make[1]: *** [arch/arm/dts/armada-xp-gp-bb.dtb] Error 1 make[1]: *** Waiting for unfinished jobs.... FATAL ERROR: Couldn't open "skeleton64.dtsi": No such file or directory scripts/Makefile.lib:266: recipe for target 'arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dtb' failed make[1]: *** [arch/arm/dts/armada-xp-lenovo-ix4-300d-bb.dtb] Error 1 FATAL ERROR: Couldn't open "skeleton64.dtsi": No such file or directory scripts/Makefile.lib:266: recipe for target 'arch/arm/dts/armada-370-mirabox-bb.dtb' failed make[1]: *** [arch/arm/dts/armada-370-mirabox-bb.dtb] Error 1 Makefile:772: recipe for target 'arch/arm/dts' failed make: *** [arch/arm/dts] Error 2 make: *** Waiting for unfinished jobs.... -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
