]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
image-fit: Fix compiling error caused by autoconf.h
authorYork Sun <york.sun@nxp.com>
Wed, 23 Nov 2016 17:25:09 +0000 (09:25 -0800)
committerYork Sun <york.sun@nxp.com>
Wed, 23 Nov 2016 18:40:08 +0000 (10:40 -0800)
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>
common/image-fit.c

index ea56d5bd7acf89ea8fcdfb7aa4c8b1eb9597591b..9468e519dbbe3f4cdd40388d78b146e6132a1fb1 100644 (file)
@@ -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 */