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 /drivers | |
| parent | 282f15804b45d3dd42f31fbbce090aaaa579db6c (diff) | |
| parent | d5032392babd3a8bd027ccb79072ee7b05299b67 (diff) | |
| download | u-boot-9d24b01ce0e938b49270386467e3edd4476e9108.tar.gz u-boot-9d24b01ce0e938b49270386467e3edd4476e9108.tar.bz2 u-boot-9d24b01ce0e938b49270386467e3edd4476e9108.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bios_emulator/atibios.c | 4 | ||||
| -rw-r--r-- | drivers/pci/pci_rom.c | 4 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c index 2d5b5dc562..4a16fc7e1c 100644 --- a/drivers/bios_emulator/atibios.c +++ b/drivers/bios_emulator/atibios.c @@ -65,6 +65,7 @@ static u32 saveBaseAddress20; /* Addres im memory of VBE region */ const int vbe_offset = 0x2000; +#ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE static const void *bios_ptr(const void *buf, BE_VGAInfo *vga_info, u32 x86_dword_ptr) { @@ -215,6 +216,7 @@ static int atibios_set_vesa_mode(RMREGS *regs, int vesa_mode, return 0; } +#endif /* CONFIG_FRAMEBUFFER_SET_VESA_MODE */ /**************************************************************************** PARAMETERS: @@ -263,11 +265,13 @@ static void PCI_doBIOSPOST(pci_dev_t pcidev, BE_VGAInfo *vga_info, /*Cleanup and exit*/ BE_getVGA(vga_info); +#ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE /* Useful for debugging */ if (0) atibios_debug_mode(vga_info, ®s, vesa_mode, mode_info); if (vesa_mode != -1) atibios_set_vesa_mode(®s, vesa_mode, mode_info); +#endif } /**************************************************************************** diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 46fe5e6247..7f461943f8 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -355,8 +355,6 @@ int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void)) struct video_priv *uc_priv = dev_get_uclass_priv(dev); int ret; - printf("Video: "); - /* If we are running from EFI or coreboot, this can't work */ if (!ll_boot_init()) { printf("Not available (previous bootloader prevents it)\n"); @@ -377,7 +375,7 @@ int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void)) return ret; } - printf("%dx%dx%d\n", uc_priv->xsize, uc_priv->ysize, + printf("Video: %dx%dx%d\n", uc_priv->xsize, uc_priv->ysize, mode_info.vesa.bits_per_pixel); return 0; diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 45a105db06..4c4d2861fe 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -174,7 +174,7 @@ config FRAMEBUFFER_SET_VESA_MODE choice prompt "framebuffer graphics resolution" - default FRAMEBUFFER_VESA_MODE_117 + default FRAMEBUFFER_VESA_MODE_118 depends on FRAMEBUFFER_SET_VESA_MODE help This option sets the resolution used for the U-Boot framebuffer (and |