diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-23 09:25:09 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 10:40:08 -0800 |
| commit | 020198b0c7d251cf6bde76024ecf0ee711860534 (patch) | |
| tree | 0c9728f23a6a6250ce551ab313baa29df73a6320 /common/image-fit.c | |
| parent | f9dd8553f31817353f2a04385a1a0909df9670e4 (diff) | |
| download | u-boot-imx-020198b0c7d251cf6bde76024ecf0ee711860534.zip u-boot-imx-020198b0c7d251cf6bde76024ecf0ee711860534.tar.gz u-boot-imx-020198b0c7d251cf6bde76024ecf0ee711860534.tar.bz2 | |
image-fit: Fix compiling error caused by autoconf.h
Commit ec6617c3 includes autoconf.h in image-fit.c, causing conflict
for board odroid-xu3 which overwrites CONFIG_SYS_BOARD in header
file. Move the include higher and use linux/kconfig.h instead of
generated/autoconf.h.
Signed-off-by: York Sun <york.sun@nxp.com>
CC: Alison Wang <alison.wang@nxp.com>
Diffstat (limited to 'common/image-fit.c')
| -rw-r--r-- | common/image-fit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/image-fit.c b/common/image-fit.c index ea56d5b..9468e51 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -14,6 +14,7 @@ #include <time.h> #else #include <linux/compiler.h> +#include <linux/kconfig.h> #include <common.h> #include <errno.h> #include <mapmem.h> @@ -27,7 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; #include <u-boot/md5.h> #include <u-boot/sha1.h> #include <u-boot/sha256.h> -#include <generated/autoconf.h> /*****************************************************************************/ /* New uImage format routines */ |