Convert CONFIG_SYS_MAX_NAND_DEVICE to Kconfig

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

diff --git a/include/elf.h b/include/elf.h
index 6802428..aeda159 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 */
@@ -593,6 +593,9 @@ unsigned long elf_hash(const unsigned char *name);
 /* Values for Elf32/64_Ehdr.e_flags */
 #define EF_PPC_EMB             0x80000000      /* PowerPC embedded flag */
 
+#define EF_PPC64_ELFV1_ABI     0x00000001
+#define EF_PPC64_ELFV2_ABI     0x00000002
+
 /* Cygnus local bits below */
 #define EF_PPC_RELOCATABLE     0x00010000      /* PowerPC -mrelocatable flag*/
 #define EF_PPC_RELOCATABLE_LIB 0x00008000      /* PowerPC -mrelocatable-lib
@@ -687,8 +690,12 @@ 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);
+unsigned long load_elf_image_phdr(unsigned long addr);
+unsigned long load_elf_image_shdr(unsigned long addr);
 #endif
 
 #endif /* _ELF_H */