Commit 020198b0c7d251cf6bde76024ecf0ee711860534
1 parent
f9dd8553f3
Exists in
v2017.01-smarct4x
and in
25 other branches
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>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
common/image-fit.c
| ... | ... | @@ -14,6 +14,7 @@ |
| 14 | 14 | #include <time.h> |
| 15 | 15 | #else |
| 16 | 16 | #include <linux/compiler.h> |
| 17 | +#include <linux/kconfig.h> | |
| 17 | 18 | #include <common.h> |
| 18 | 19 | #include <errno.h> |
| 19 | 20 | #include <mapmem.h> |
| ... | ... | @@ -27,7 +28,6 @@ |
| 27 | 28 | #include <u-boot/md5.h> |
| 28 | 29 | #include <u-boot/sha1.h> |
| 29 | 30 | #include <u-boot/sha256.h> |
| 30 | -#include <generated/autoconf.h> | |
| 31 | 31 | |
| 32 | 32 | /*****************************************************************************/ |
| 33 | 33 | /* New uImage format routines */ |