| Message ID | 20170829201601.64312-16-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | b145b45b0ce26028d9ad6ea8277c052c3c87ea56 |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | dtoc: Add support for 64-bit addresses | expand |
The filename of the auto-generated file is the same as the file that
includes it. Even though the form is in the generated/ subdirectory, this
could be confused.
Rename the generated file to something that makes it clear it is
auto-generated.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2: None
include/dt-structs.h | 2 +-
scripts/Makefile.spl | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
Applied to u-boot-fdt thanks!
diff --git a/include/dt-structs.h b/include/dt-structs.h index 76979e73e1..c0f56951b5 100644 --- a/include/dt-structs.h +++ b/include/dt-structs.h @@ -23,7 +23,7 @@ struct phandle_2_arg { const void *node; int arg[2]; }; -#include <generated/dt-structs.h> +#include <generated/dt-structs-gen.h> #endif #endif diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index dd8065d87d..b86ea76bab 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -257,14 +257,15 @@ cmd_dtoch = $(pythonpath) $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o quiet_cmd_plat = PLAT $@ cmd_plat = $(CC) $(c_flags) -c $< -o $@ -$(obj)/dts/dt-platdata.o: $(obj)/dts/dt-platdata.c include/generated/dt-structs.h +$(obj)/dts/dt-platdata.o: $(obj)/dts/dt-platdata.c \ + include/generated/dt-structs-gen.h $(call if_changed,plat) PHONY += dts_dir dts_dir: $(shell [ -d $(obj)/dts ] || mkdir -p $(obj)/dts) -include/generated/dt-structs.h: $(obj)/$(SPL_BIN).dtb dts_dir checkdtoc +include/generated/dt-structs-gen.h: $(obj)/$(SPL_BIN).dtb dts_dir checkdtoc $(call if_changed,dtoch) $(obj)/dts/dt-platdata.c: $(obj)/$(SPL_BIN).dtb dts_dir checkdtoc
The filename of the auto-generated file is the same as the file that includes it. Even though the form is in the generated/ subdirectory, this could be confused. Rename the generated file to something that makes it clear it is auto-generated. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: None include/dt-structs.h | 2 +- scripts/Makefile.spl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)