diff options
| author | Tom Rini <trini@ti.com> | 2012-12-03 06:47:05 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-03 06:47:05 -0700 |
| commit | ce12a8c1a94a2b3d585feff387497f724b98e3ce (patch) | |
| tree | 6e5db764e27df2465f5e4d9487c7561d14050064 /arch/x86/lib/zimage.c | |
| parent | b04eb342af72d5dbcc29ccd7f3f9475044113361 (diff) | |
| parent | 339c5111065c2b1893af1e4d6e9431b9496879a4 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/zimage.c')
| -rw-r--r-- | arch/x86/lib/zimage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 22142864c22..b8c672babdd 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -171,7 +171,7 @@ struct boot_params *load_zimage(char *image, unsigned long kernel_size, else *load_address = (void *)ZIMAGE_LOAD_ADDR; -#if defined CONFIG_ZBOOT_32 +#if (defined CONFIG_ZBOOT_32 || defined CONFIG_X86_NO_REAL_MODE) printf("Building boot_params at 0x%8.8lx\n", (ulong)setup_base); memset(setup_base, 0, sizeof(*setup_base)); setup_base->hdr = params->hdr; @@ -237,7 +237,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, struct setup_header *hdr = &setup_base->hdr; int bootproto = get_boot_protocol(hdr); -#if defined CONFIG_ZBOOT_32 +#if (defined CONFIG_ZBOOT_32 || defined CONFIG_X86_NO_REAL_MODE) setup_base->e820_entries = install_e820_map( ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map); #endif |