diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:24:46 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:24:46 +0100 |
| commit | 9c2aa617030a44f3d336b5fef3861eac142290d2 (patch) | |
| tree | 5d7781f36a0c5677c6c49431f79a3760da46b5b3 /scripts | |
| parent | 048b03641e9350bbf6672ce22003a663eebe0c3f (diff) | |
| parent | d7db7df1879e17d547e123f9a56abeac26aab203 (diff) | |
| download | barebox-9c2aa617030a44f3d336b5fef3861eac142290d2.tar.gz barebox-9c2aa617030a44f3d336b5fef3861eac142290d2.tar.xz | |
Merge branch 'for-next/imx-image'
Conflicts:
arch/arm/dts/Makefile
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index f71c3b7c27..d403037c17 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -374,7 +374,9 @@ cmd_imximage_S_dcd= \ echo '.balign STRUCT_ALIGNMENT'; \ ) > $@ -imxcfg_cpp_flags = -Wp,-MD,$(depfile) -nostdinc -x assembler-with-cpp +imxcfg_cpp_flags = -Wp,-MD,$(depfile) -nostdinc -x assembler-with-cpp \ + -I $(srctree)/include -I $(MACH)/include \ + -include $(srctree)/include/generated/autoconf.h dcd-tmp = $(subst $(comma),_,$(dot-target).dcd.tmp) |