summaryrefslogtreecommitdiff
path: root/arch/x86/lib/zimage.c
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2012-11-29 16:23:41 +0000
committerSimon Glass <sjg@chromium.org>2012-11-30 13:44:04 -0800
commit5b5ece9ef4ac1a859179b894c3067e2841d76472 (patch)
tree036c632e07a534a7a5d98263e498c2d008a029ae /arch/x86/lib/zimage.c
parent420a2ca73f5805be5e69d01cfe60a06fba8c9754 (diff)
downloadu-boot-imx-5b5ece9ef4ac1a859179b894c3067e2841d76472.zip
u-boot-imx-5b5ece9ef4ac1a859179b894c3067e2841d76472.tar.gz
u-boot-imx-5b5ece9ef4ac1a859179b894c3067e2841d76472.tar.bz2
x86: Allow compiling out realmode/bios code
We don't want this for coreboot, so provide a way of compiling it out. Signed-off-by: Gabe Black <gabeblack@chromium.org> Signed-off-by: Stefan Reinauer <reinauer@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/lib/zimage.c')
-rw-r--r--arch/x86/lib/zimage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 2214286..b8c672b 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