Merge git://git.denx.de/u-boot-x86

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

diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index 90768a99ceb829d82d77bc61db7a947fa6daa27f..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 {
@@ -108,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 */