diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/display_options.c | 8 | ||||
| -rw-r--r-- | lib/efi/efi_app.c | 1 | ||||
| -rw-r--r-- | lib/fdtdec.c | 2 | ||||
| -rw-r--r-- | lib/hang.c | 1 | ||||
| -rw-r--r-- | lib/libavb/avb_sysdeps_posix.c | 1 | ||||
| -rw-r--r-- | lib/optee/optee.c | 1 | ||||
| -rw-r--r-- | lib/panic.c | 1 | ||||
| -rw-r--r-- | lib/zlib/zutil.c | 3 |
8 files changed, 13 insertions, 5 deletions
diff --git a/lib/display_options.c b/lib/display_options.c index ec16d75e0e..74f769d9ff 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -137,7 +137,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, { /* linebuf as a union causes proper alignment */ union linebuf { -#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA +#ifdef MEM_SUPPORT_64BIT_DATA uint64_t uq[MAX_LINE_LENGTH_BYTES/sizeof(uint64_t) + 1]; #endif uint32_t ui[MAX_LINE_LENGTH_BYTES/sizeof(uint32_t) + 1]; @@ -145,7 +145,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, uint8_t uc[MAX_LINE_LENGTH_BYTES/sizeof(uint8_t) + 1]; } lb; int i; -#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA +#ifdef MEM_SUPPORT_64BIT_DATA uint64_t __maybe_unused x; #else uint32_t __maybe_unused x; @@ -168,7 +168,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, for (i = 0; i < thislinelen; i++) { if (width == 4) x = lb.ui[i] = *(volatile uint32_t *)data; -#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA +#ifdef MEM_SUPPORT_64BIT_DATA else if (width == 8) x = lb.uq[i] = *(volatile uint64_t *)data; #endif @@ -178,7 +178,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, x = lb.uc[i] = *(volatile uint8_t *)data; #if defined(CONFIG_SPL_BUILD) printf(" %x", (uint)x); -#elif defined(CONFIG_SYS_SUPPORT_64BIT_DATA) +#elif defined(MEM_SUPPORT_64BIT_DATA) printf(" %0*llx", width * 2, (long long)x); #else printf(" %0*x", width * 2, x); diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c index 0047998ee0..af5a878fc3 100644 --- a/lib/efi/efi_app.c +++ b/lib/efi/efi_app.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <debug_uart.h> #include <dm.h> #include <errno.h> diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 61af3472e6..17051d409c 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -7,6 +7,8 @@ #include <common.h> #include <boot_fit.h> #include <dm.h> +#include <hang.h> +#include <init.h> #include <dm/of_extra.h> #include <env.h> #include <errno.h> diff --git a/lib/hang.c b/lib/hang.c index 4d026a3e64..578ac78d45 100644 --- a/lib/hang.c +++ b/lib/hang.c @@ -9,6 +9,7 @@ #include <common.h> #include <bootstage.h> +#include <hang.h> #include <os.h> /** diff --git a/lib/libavb/avb_sysdeps_posix.c b/lib/libavb/avb_sysdeps_posix.c index 4ccf41e428..0bb0cc1498 100644 --- a/lib/libavb/avb_sysdeps_posix.c +++ b/lib/libavb/avb_sysdeps_posix.c @@ -3,6 +3,7 @@ * Copyright (C) 2016 The Android Open Source Project */ +#include <hang.h> #include <stdarg.h> #include <stdlib.h> diff --git a/lib/optee/optee.c b/lib/optee/optee.c index c883c498e1..9b49eb8ee7 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <image.h> #include <malloc.h> #include <linux/libfdt.h> #include <tee/optee.h> diff --git a/lib/panic.c b/lib/panic.c index bae8a35935..8e72c265a6 100644 --- a/lib/panic.c +++ b/lib/panic.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <hang.h> #if !defined(CONFIG_PANIC_HANG) #include <command.h> #endif diff --git a/lib/zlib/zutil.c b/lib/zlib/zutil.c index 227343e48d..609aac55ce 100644 --- a/lib/zlib/zutil.c +++ b/lib/zlib/zutil.c @@ -6,6 +6,7 @@ /* @(#) $Id$ */ #include "zutil.h" +#include <hang.h> #ifndef NO_DUMMY_DECL struct internal_state {int dummy;}; /* for buggy compilers */ @@ -34,7 +35,7 @@ void z_error (m) char *m; { fprintf(stderr, "%s\n", m); - hang (); + hang(); } #endif |