diff options
| author | Maxim Uvarov <maxim.uvarov@linaro.org> | 2023-12-26 21:46:16 +0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-11 11:24:58 -0500 |
| commit | 9c77cffabd7c08411e9e4ae0a4ed1206f9c2e9c5 (patch) | |
| tree | 3b77032910378e713a5a8630818611eb5fcd85ad /arch | |
| parent | c64a1e43acb80fce6705c57e9be4e036a97767a3 (diff) | |
| download | u-boot-9c77cffabd7c08411e9e4ae0a4ed1206f9c2e9c5.zip u-boot-9c77cffabd7c08411e9e4ae0a4ed1206f9c2e9c5.tar.gz u-boot-9c77cffabd7c08411e9e4ae0a4ed1206f9c2e9c5.tar.bz2 | |
mach-socfpga: do not overlap defines with lwip
Fix compilation issue with overlapping lwip and march defines.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/handoff_soc64.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/wrap_handoff_soc64.c | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/handoff_soc64.h b/arch/arm/mach-socfpga/include/mach/handoff_soc64.h index 902fc6b..9b85e58 100644 --- a/arch/arm/mach-socfpga/include/mach/handoff_soc64.h +++ b/arch/arm/mach-socfpga/include/mach/handoff_soc64.h @@ -78,12 +78,6 @@ #ifndef __ASSEMBLY__ #include <asm/types.h> -enum endianness { - LITTLE_ENDIAN = 0, - BIG_ENDIAN, - UNKNOWN_ENDIANNESS -}; - int socfpga_get_handoff_size(void *handoff_address); int socfpga_handoff_read(void *handoff_address, void *table, u32 table_len); #endif diff --git a/arch/arm/mach-socfpga/wrap_handoff_soc64.c b/arch/arm/mach-socfpga/wrap_handoff_soc64.c index e7cb5ea..df0701e 100644 --- a/arch/arm/mach-socfpga/wrap_handoff_soc64.c +++ b/arch/arm/mach-socfpga/wrap_handoff_soc64.c @@ -10,6 +10,15 @@ #include <errno.h> #include "log.h" +#ifndef __ASSEMBLY__ +#include <asm/types.h> +enum endianness { + LITTLE_ENDIAN = 0, + BIG_ENDIAN, + UNKNOWN_ENDIANNESS +}; +#endif + static enum endianness check_endianness(u32 handoff) { switch (handoff) { |