| Message ID | 1419369212-17047-2-git-send-email-chris.packham@alliedtelesis.co.nz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Dec 23, 2014 at 3:13 PM, Chris Packham <chris.packham@alliedtelesis.co.nz> wrote: > Currently in arch and driver code that needs early access to the > flattened device tree it is necessary to add specific CFLAGS so that > when scripts/dtc/libfdt/libfdt.h is included the C preprocessor is able > to locate the libfdt versions of libfdt_env.h and fdt.h without > generating an error. > > We already provide an alternative linux-specific > version of libfdt_env.h and directly include scripts/dtc/libfdt/fdt.h > so the inclusion by scripts/dtc/libfdt/libfdt.h is a no-op thanks to the > inclusion guards. > > By using quotes in scripts/dtc/libfdt/libfdt.h it picks up fdt.h and > libfdt_env.h from the source directory without needing to add CFLAGS for > the sources that happen to include linux/libfdt.h. > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > For the files that include linux/libfdt.h we currently also have to > specify additional CFLAGS to satisfy the CPP. > > $ git grep '<linux/libfdt.h>' > arch/mips/cavium-octeon/octeon-platform.c:#include <linux/libfdt.h> > arch/mips/cavium-octeon/setup.c:#include <linux/libfdt.h> > arch/mips/mti-sead3/sead3-setup.c:#include <linux/libfdt.h> > arch/powerpc/kernel/prom.c:#include <linux/libfdt.h> > drivers/firmware/efi/libstub/fdt.c:#include <linux/libfdt.h> > drivers/of/fdt.c:#include <linux/libfdt.h> > drivers/of/fdt_address.c:#include <linux/libfdt.h> > > $ git grep -e '-I.*dtc/libfdt' > arch/mips/cavium-octeon/Makefile:CFLAGS_octeon-platform.o = -I$(src)/../../../scripts/dtc/libfdt > arch/mips/cavium-octeon/Makefile:CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt > arch/mips/mti-sead3/Makefile:CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt > arch/powerpc/kernel/Makefile:CFLAGS_prom.o = -I$(src)/../../../scripts/dtc/libfdt > drivers/firmware/efi/libstub/Makefile:CFLAGS_fdt.o += -I$(srctree)/scripts/dtc/libfdt/ > drivers/of/Makefile:CFLAGS_fdt.o = -I$(src)/../../scripts/dtc/libfdt > drivers/of/Makefile:CFLAGS_fdt_address.o = -I$(src)/../../scripts/dtc/libfdt > lib/Makefile: $(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt)) > > Simply by switching to using quotes we can avoid having this extra step. Nice, but I would like to see all of these CFLAGS removed as well. > scripts/dtc/libfdt/libfdt.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) This is an import of dtc/libfdt and patches to it should be sent upstream and to devicetree-compiler list. Rob > diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h > index 73f4975..ea1ddcd 100644 > --- a/scripts/dtc/libfdt/libfdt.h > +++ b/scripts/dtc/libfdt/libfdt.h > @@ -51,8 +51,8 @@ > * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > -#include <libfdt_env.h> > -#include <fdt.h> > +#include "libfdt_env.h" > +#include "fdt.h" > > #define FDT_FIRST_SUPPORTED_VERSION 0x10 > #define FDT_LAST_SUPPORTED_VERSION 0x11 > -- > 2.2.0.rc0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Rob, On Sat, 27 Dec 2014, Rob Herring wrote: > On Tue, Dec 23, 2014 at 3:13 PM, Chris Packham > <chris.packham@alliedtelesis.co.nz> wrote: >> Currently in arch and driver code that needs early access to the >> flattened device tree it is necessary to add specific CFLAGS so that >> when scripts/dtc/libfdt/libfdt.h is included the C preprocessor is able >> to locate the libfdt versions of libfdt_env.h and fdt.h without >> generating an error. >> >> We already provide an alternative linux-specific >> version of libfdt_env.h and directly include scripts/dtc/libfdt/fdt.h >> so the inclusion by scripts/dtc/libfdt/libfdt.h is a no-op thanks to the >> inclusion guards. >> >> By using quotes in scripts/dtc/libfdt/libfdt.h it picks up fdt.h and >> libfdt_env.h from the source directory without needing to add CFLAGS for >> the sources that happen to include linux/libfdt.h. >> >> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> >> --- >> For the files that include linux/libfdt.h we currently also have to >> specify additional CFLAGS to satisfy the CPP. >> >> $ git grep '<linux/libfdt.h>' >> arch/mips/cavium-octeon/octeon-platform.c:#include <linux/libfdt.h> >> arch/mips/cavium-octeon/setup.c:#include <linux/libfdt.h> >> arch/mips/mti-sead3/sead3-setup.c:#include <linux/libfdt.h> >> arch/powerpc/kernel/prom.c:#include <linux/libfdt.h> >> drivers/firmware/efi/libstub/fdt.c:#include <linux/libfdt.h> >> drivers/of/fdt.c:#include <linux/libfdt.h> >> drivers/of/fdt_address.c:#include <linux/libfdt.h> >> >> $ git grep -e '-I.*dtc/libfdt' >> arch/mips/cavium-octeon/Makefile:CFLAGS_octeon-platform.o = -I$(src)/../../../scripts/dtc/libfdt >> arch/mips/cavium-octeon/Makefile:CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt >> arch/mips/mti-sead3/Makefile:CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt >> arch/powerpc/kernel/Makefile:CFLAGS_prom.o = -I$(src)/../../../scripts/dtc/libfdt >> drivers/firmware/efi/libstub/Makefile:CFLAGS_fdt.o += -I$(srctree)/scripts/dtc/libfdt/ >> drivers/of/Makefile:CFLAGS_fdt.o = -I$(src)/../../scripts/dtc/libfdt >> drivers/of/Makefile:CFLAGS_fdt_address.o = -I$(src)/../../scripts/dtc/libfdt >> lib/Makefile: $(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt)) >> >> Simply by switching to using quotes we can avoid having this extra step. > > Nice, but I would like to see all of these CFLAGS removed as well. > If/when this is accepted I'll send a follow up patch removing these. Given the comment below about getting the patch in the upstream dtc repository it make take some time for it to be accepted there and then sync'd with the kernel source. >> scripts/dtc/libfdt/libfdt.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > This is an import of dtc/libfdt and patches to it should be sent > upstream and to devicetree-compiler list. Have done so now. > > Rob > >> diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h >> index 73f4975..ea1ddcd 100644 >> --- a/scripts/dtc/libfdt/libfdt.h >> +++ b/scripts/dtc/libfdt/libfdt.h >> @@ -51,8 +51,8 @@ >> * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >> */ >> >> -#include <libfdt_env.h> >> -#include <fdt.h> >> +#include "libfdt_env.h" >> +#include "fdt.h" >> >> #define FDT_FIRST_SUPPORTED_VERSION 0x10 >> #define FDT_LAST_SUPPORTED_VERSION 0x11 >> -- >> 2.2.0.rc0 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h index 73f4975..ea1ddcd 100644 --- a/scripts/dtc/libfdt/libfdt.h +++ b/scripts/dtc/libfdt/libfdt.h @@ -51,8 +51,8 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <libfdt_env.h> -#include <fdt.h> +#include "libfdt_env.h" +#include "fdt.h" #define FDT_FIRST_SUPPORTED_VERSION 0x10 #define FDT_LAST_SUPPORTED_VERSION 0x11
Currently in arch and driver code that needs early access to the flattened device tree it is necessary to add specific CFLAGS so that when scripts/dtc/libfdt/libfdt.h is included the C preprocessor is able to locate the libfdt versions of libfdt_env.h and fdt.h without generating an error. We already provide an alternative linux-specific version of libfdt_env.h and directly include scripts/dtc/libfdt/fdt.h so the inclusion by scripts/dtc/libfdt/libfdt.h is a no-op thanks to the inclusion guards. By using quotes in scripts/dtc/libfdt/libfdt.h it picks up fdt.h and libfdt_env.h from the source directory without needing to add CFLAGS for the sources that happen to include linux/libfdt.h. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> --- For the files that include linux/libfdt.h we currently also have to specify additional CFLAGS to satisfy the CPP. $ git grep '<linux/libfdt.h>' arch/mips/cavium-octeon/octeon-platform.c:#include <linux/libfdt.h> arch/mips/cavium-octeon/setup.c:#include <linux/libfdt.h> arch/mips/mti-sead3/sead3-setup.c:#include <linux/libfdt.h> arch/powerpc/kernel/prom.c:#include <linux/libfdt.h> drivers/firmware/efi/libstub/fdt.c:#include <linux/libfdt.h> drivers/of/fdt.c:#include <linux/libfdt.h> drivers/of/fdt_address.c:#include <linux/libfdt.h> $ git grep -e '-I.*dtc/libfdt' arch/mips/cavium-octeon/Makefile:CFLAGS_octeon-platform.o = -I$(src)/../../../scripts/dtc/libfdt arch/mips/cavium-octeon/Makefile:CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt arch/mips/mti-sead3/Makefile:CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt arch/powerpc/kernel/Makefile:CFLAGS_prom.o = -I$(src)/../../../scripts/dtc/libfdt drivers/firmware/efi/libstub/Makefile:CFLAGS_fdt.o += -I$(srctree)/scripts/dtc/libfdt/ drivers/of/Makefile:CFLAGS_fdt.o = -I$(src)/../../scripts/dtc/libfdt drivers/of/Makefile:CFLAGS_fdt_address.o = -I$(src)/../../scripts/dtc/libfdt lib/Makefile: $(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt)) Simply by switching to using quotes we can avoid having this extra step. scripts/dtc/libfdt/libfdt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)