diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-16 13:24:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-16 13:24:20 -0400 |
| commit | 9d24b01ce0e938b49270386467e3edd4476e9108 (patch) | |
| tree | 6cc85d250cee64440ffc6dedc47aa5b626fd2c88 /arch/x86/lib/bios.c | |
| parent | 282f15804b45d3dd42f31fbbce090aaaa579db6c (diff) | |
| parent | d5032392babd3a8bd027ccb79072ee7b05299b67 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/bios.c')
| -rw-r--r-- | arch/x86/lib/bios.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index 66d7629a6dd..f9092fdc651 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -185,6 +185,7 @@ static void setup_realmode_idt(void) write_idt_stub((void *)0xffe6e, 0x1a); } +#ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE static u8 vbe_get_mode_info(struct vbe_mode_info *mi) { u16 buffer_seg; @@ -241,6 +242,7 @@ static void vbe_set_graphics(int vesa_mode, struct vbe_mode_info *mode_info) mode_info->video_mode &= 0x3ff; vbe_set_mode(mode_info); } +#endif /* CONFIG_FRAMEBUFFER_SET_VESA_MODE */ void bios_run_on_x86(struct udevice *dev, unsigned long addr, int vesa_mode, struct vbe_mode_info *mode_info) @@ -273,8 +275,10 @@ void bios_run_on_x86(struct udevice *dev, unsigned long addr, int vesa_mode, 0x0); debug("done\n"); +#ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE if (vesa_mode != -1) vbe_set_graphics(vesa_mode, mode_info); +#endif } asmlinkage int interrupt_handler(u32 intnumber, u32 gsfs, u32 dses, |