x86: Rename e820entry to e820_entry

[u-boot] / arch / x86 / include / asm / bootparam.h

diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index 140095117e5a2daef0a097c55f0ed10e08acc781..0386cbeca508f0d421e0fdef6463cf037ea88d7f 100644 (file)
--- a/arch/x86/include/asm/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
@@ -10,8 +10,11 @@
 #include <asm/video/edid.h>
 
 /* setup data types */
-#define SETUP_NONE                     0
-#define SETUP_E820_EXT                 1
+enum {
+       SETUP_NONE = 0,
+       SETUP_E820_EXT,
+       SETUP_DTB,
+};
 
 /* extensible setup data list node */
 struct setup_data {
@@ -63,6 +66,10 @@ struct setup_header {
        __u32   payload_offset;
        __u32   payload_length;
        __u64   setup_data;
+       __u64   pref_address;
+       __u32   init_size;
+       __u32   handover_offset;
+       __u64   acpi_rsdp_addr;
 } __attribute__((packed));
 
 struct sys_desc_table {
@@ -104,7 +111,7 @@ struct boot_params {
        struct setup_header hdr;    /* setup header */  /* 0x1f1 */
        __u8  _pad7[0x290-0x1f1-sizeof(struct setup_header)];
        __u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX];      /* 0x290 */
-       struct e820entry e820_map[E820MAX];             /* 0x2d0 */
+       struct e820_entry e820_map[E820MAX];            /* 0x2d0 */
        __u8  _pad8[48];                                /* 0xcd0 */
        struct edd_info eddbuf[EDDMAXNR];               /* 0xd00 */
        __u8  _pad9[276];                               /* 0xeec */
@@ -114,7 +121,8 @@ enum {
        X86_SUBARCH_PC = 0,
        X86_SUBARCH_LGUEST,
        X86_SUBARCH_XEN,
-       X86_SUBARCH_MRST,
+       X86_SUBARCH_INTEL_MID,
+       X86_SUBARCH_CE4100,
        X86_NR_SUBARCHS,
 };
 #endif /* _ASM_X86_BOOTPARAM_H */