diff options
| author | Simon Glass <sjg@chromium.org> | 2020-05-10 11:40:12 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-18 21:19:23 -0400 |
| commit | f09f1ecbe77863ecefe586ccd6000064b49105a3 (patch) | |
| tree | 424300a0c18924e75e0694782fe3e2ba48e884a0 /include | |
| parent | c05ed00afb95fa5237f16962fccf5810437317bf (diff) | |
| download | u-boot-f09f1ecbe77863ecefe586ccd6000064b49105a3.zip u-boot-f09f1ecbe77863ecefe586ccd6000064b49105a3.tar.gz u-boot-f09f1ecbe77863ecefe586ccd6000064b49105a3.tar.bz2 | |
Use __ASSEMBLY__ as the assembly macros
Some places use __ASSEMBLER__ instead which does not work since the
Makefile does not define it. Fix them.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/atf_common.h | 2 | ||||
| -rw-r--r-- | include/elf.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/atf_common.h b/include/atf_common.h index 3a7d40e..fd5454c 100644 --- a/include/atf_common.h +++ b/include/atf_common.h @@ -177,6 +177,6 @@ struct bl2_to_bl31_params_mem { struct entry_point_info bl31_ep_info; }; -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLY__ */ #endif /* __BL_COMMON_H__ */ diff --git a/include/elf.h b/include/elf.h index e7c5198..b04e746 100644 --- a/include/elf.h +++ b/include/elf.h @@ -9,7 +9,7 @@ #ifndef _ELF_H #define _ELF_H -#ifndef __ASSEMBLER__ +#ifndef __ASSEMBLY__ #include "compiler.h" /* This version doesn't work for 64-bit ABIs - Erik */ @@ -690,7 +690,7 @@ unsigned long elf_hash(const unsigned char *name); #define R_RISCV_64 2 #define R_RISCV_RELATIVE 3 -#ifndef __ASSEMBLER__ +#ifndef __ASSEMBLY__ int valid_elf_image(unsigned long addr); unsigned long load_elf64_image_phdr(unsigned long addr); unsigned long load_elf64_image_shdr(unsigned long addr); |