diff options
| author | Tom Rini <[email protected]> | 2023-12-21 11:51:58 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-12-21 11:51:58 -0500 |
| commit | ae797e022e6de408497a5ffaa329751893762b9b (patch) | |
| tree | c8b6c0f66052e329cc57451c9e0fe2d24bc3407d /boot | |
| parent | 36d3db6c2c060ee85176156dc9a607e8cd5465f4 (diff) | |
| parent | 467382ca03758e4f3f13107e3a83669e93a7461e (diff) | |
Merge branch '2023-12-21-header-inclusion-cleanup' into next
- Merge in changes to clean up various places that used <common.h> or
<linux/kconfig.h>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/image-fit.c | 2 | ||||
| -rw-r--r-- | boot/image.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/boot/image-fit.c b/boot/image-fit.c index 3cc556b727f..89e377563ce 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -15,6 +15,7 @@ #include <time.h> #include <linux/libfdt.h> #include <u-boot/crc.h> +#include <linux/kconfig.h> #else #include <linux/compiler.h> #include <linux/sizes.h> @@ -36,7 +37,6 @@ DECLARE_GLOBAL_DATA_PTR; #include <bootm.h> #include <image.h> #include <bootstage.h> -#include <linux/kconfig.h> #include <u-boot/crc.h> #include <u-boot/md5.h> #include <u-boot/sha1.h> diff --git a/boot/image.c b/boot/image.c index 675b5dd77f9..073931cd7a3 100644 --- a/boot/image.c +++ b/boot/image.c @@ -42,6 +42,7 @@ DECLARE_GLOBAL_DATA_PTR; #else /* USE_HOSTCC */ #include "mkimage.h" +#include <linux/kconfig.h> #include <u-boot/md5.h> #include <time.h> @@ -62,7 +63,6 @@ DECLARE_GLOBAL_DATA_PTR; #include <relocate.h> #include <linux/lzo.h> #include <linux/zstd.h> -#include <linux/kconfig.h> #include <lzma/LzmaTypes.h> #include <lzma/LzmaDec.h> #include <lzma/LzmaTools.h> |