diff options
| author | Tom Rini <[email protected]> | 2022-04-12 09:52:08 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-12 09:52:08 -0400 |
| commit | b2a22b2c9f07e4c78108feb3bc16e18ebd88388a (patch) | |
| tree | dc52ce22391f1c19088b726c145ccbae965fd65c | |
| parent | a7fb97b6e6e00d80705700671a26cb127c01430b (diff) | |
| parent | c8f9e666abcc267ec3fed7083fbd9bc57943f334 (diff) | |
Merge branch '2022-04-12-two-more-fixes'
- Bugfix in cpu_to_be32_array() and re-use $(UBOOTINCLUDE) in
dtc_cpp_flags
| -rw-r--r-- | include/linux/byteorder/generic.h | 4 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/byteorder/generic.h b/include/linux/byteorder/generic.h index 8fae186d1ad..bee0ff60336 100644 --- a/include/linux/byteorder/generic.h +++ b/include/linux/byteorder/generic.h @@ -190,7 +190,7 @@ static inline void be64_add_cpu(__be64 *var, u64 val) static inline void cpu_to_be32_array(__be32 *dst, const u32 *src, size_t len) { - int i; + size_t i; for (i = 0; i < len; i++) dst[i] = cpu_to_be32(src[i]); @@ -198,7 +198,7 @@ static inline void cpu_to_be32_array(__be32 *dst, const u32 *src, size_t len) static inline void be32_to_cpu_array(u32 *dst, const __be32 *src, size_t len) { - int i; + size_t i; for (i = 0; i < len; i++) dst[i] = be32_to_cpu(src[i]); diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index c14da10de78..2ff39d39dc8 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -185,12 +185,10 @@ u_boot_dtsi = $(strip $(u_boot_dtsi_options_debug) \ # Modified for U-Boot dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ + $(UBOOTINCLUDE) \ -I$(srctree)/arch/$(ARCH)/dts \ -I$(srctree)/arch/$(ARCH)/dts/include \ - -Iinclude \ -I$(srctree)/include \ - -I$(srctree)/arch/$(ARCH)/include \ - -include $(srctree)/include/linux/kconfig.h \ -D__ASSEMBLY__ \ -undef -D__DTS__ |