Merge tag 'u-boot-at91-2023.07-a' of https://source.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / include / elf.h

diff --git a/include/elf.h b/include/elf.h
index e7c5198..a4ba74d 100644 (file)
--- 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 */
@@ -188,14 +188,14 @@ typedef struct {
 #define EM_NDR1                57              /* Denso NDR1 microprocessor */
 #define EM_STARCORE    58              /* Motorola Start*Core processor */
 #define EM_ME16                59              /* Toyota ME16 processor */
-#define EM_ST100       60              /* STMicroelectronic ST100 processor */
+#define EM_ST100       60              /* STMicroelectronics ST100 processor */
 #define EM_TINYJ       61              /* Advanced Logic Corp. Tinyj emb.fam*/
 #define EM_X86_64      62              /* AMD x86-64 */
 #define EM_PDSP                63              /* Sony DSP Processor */
 /* RESERVED 64,65 for future use */
 #define EM_FX66                66              /* Siemens FX66 microcontroller */
 #define EM_ST9PLUS     67              /* STMicroelectronics ST9+ 8/16 mc */
-#define EM_ST7         68              /* STmicroelectronics ST7 8 bit mc */
+#define EM_ST7         68              /* STMicroelectronics ST7 8 bit mc */
 #define EM_68HC16      69              /* Motorola MC68HC16 microcontroller */
 #define EM_68HC11      70              /* Motorola MC68HC11 microcontroller */
 #define EM_68HC08      71              /* Motorola MC68HC08 microcontroller */
@@ -360,6 +360,15 @@ typedef struct {
        Elf32_Half      st_shndx;       /* section header index */
 } Elf32_Sym;
 
+typedef struct {
+       Elf64_Word      st_name;        /* name - index into string table */
+       unsigned char   st_info;        /* type and binding */
+       unsigned char   st_other;       /* 0 - no defined meaning */
+       Elf64_Half      st_shndx;       /* section header index */
+       Elf64_Addr      st_value;       /* symbol value */
+       Elf64_Xword     st_size;        /* symbol size */
+} Elf64_Sym;
+
 /* Symbol table index */
 #define STN_UNDEF      0               /* undefined */
 
@@ -690,7 +699,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);