mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-20 22:21:41 +00:00
x86: Move FRAMEBUFFER_SET_VESA_MODE etc to video Kconfig
CONFIG_FRAMEBUFFER_SET_VESA_MODE and CONFIG_FRAMEBUFFER_VESA_MODE are not x86-specific, so move them to drivers/video/Kconfig and make them depend on VIDEO_VESA driver. Some cosmetic fixes are applied to the Kconfig help text as well. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng
Simon Glass
parent
b82a535c3a
commit
6bde2dc5e2
4 changed files with 139 additions and 144 deletions
141
arch/x86/Kconfig
141
arch/x86/Kconfig
|
|
@ -187,147 +187,6 @@ config MARK_GRAPHICS_MEM_WRCOMB
|
||||||
memory is set as write-combining cache type. This option
|
memory is set as write-combining cache type. This option
|
||||||
enables marking the graphics memory as write-combining.
|
enables marking the graphics memory as write-combining.
|
||||||
|
|
||||||
menu "Display"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_SET_VESA_MODE
|
|
||||||
prompt "Set framebuffer graphics resolution"
|
|
||||||
bool
|
|
||||||
help
|
|
||||||
Set VESA/native framebuffer mode (needed for bootsplash and graphical framebuffer console)
|
|
||||||
|
|
||||||
choice
|
|
||||||
prompt "framebuffer graphics resolution"
|
|
||||||
default FRAMEBUFFER_VESA_MODE_117
|
|
||||||
depends on FRAMEBUFFER_SET_VESA_MODE
|
|
||||||
help
|
|
||||||
This option sets the resolution used for the coreboot framebuffer (and
|
|
||||||
bootsplash screen).
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_100
|
|
||||||
bool "640x400 256-color"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_101
|
|
||||||
bool "640x480 256-color"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_102
|
|
||||||
bool "800x600 16-color"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_103
|
|
||||||
bool "800x600 256-color"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_104
|
|
||||||
bool "1024x768 16-color"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_105
|
|
||||||
bool "1024x7686 256-color"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_106
|
|
||||||
bool "1280x1024 16-color"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_107
|
|
||||||
bool "1280x1024 256-color"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_108
|
|
||||||
bool "80x60 text"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_109
|
|
||||||
bool "132x25 text"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_10A
|
|
||||||
bool "132x43 text"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_10B
|
|
||||||
bool "132x50 text"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_10C
|
|
||||||
bool "132x60 text"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_10D
|
|
||||||
bool "320x200 32k-color (1:5:5:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_10E
|
|
||||||
bool "320x200 64k-color (5:6:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_10F
|
|
||||||
bool "320x200 16.8M-color (8:8:8)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_110
|
|
||||||
bool "640x480 32k-color (1:5:5:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_111
|
|
||||||
bool "640x480 64k-color (5:6:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_112
|
|
||||||
bool "640x480 16.8M-color (8:8:8)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_113
|
|
||||||
bool "800x600 32k-color (1:5:5:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_114
|
|
||||||
bool "800x600 64k-color (5:6:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_115
|
|
||||||
bool "800x600 16.8M-color (8:8:8)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_116
|
|
||||||
bool "1024x768 32k-color (1:5:5:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_117
|
|
||||||
bool "1024x768 64k-color (5:6:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_118
|
|
||||||
bool "1024x768 16.8M-color (8:8:8)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_119
|
|
||||||
bool "1280x1024 32k-color (1:5:5:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_11A
|
|
||||||
bool "1280x1024 64k-color (5:6:5)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_11B
|
|
||||||
bool "1280x1024 16.8M-color (8:8:8)"
|
|
||||||
|
|
||||||
config FRAMEBUFFER_VESA_MODE_USER
|
|
||||||
bool "Manually select VESA mode"
|
|
||||||
|
|
||||||
endchoice
|
|
||||||
|
|
||||||
# Map the config names to an integer (KB).
|
|
||||||
config FRAMEBUFFER_VESA_MODE
|
|
||||||
prompt "VESA mode" if FRAMEBUFFER_VESA_MODE_USER
|
|
||||||
hex
|
|
||||||
default 0x100 if FRAMEBUFFER_VESA_MODE_100
|
|
||||||
default 0x101 if FRAMEBUFFER_VESA_MODE_101
|
|
||||||
default 0x102 if FRAMEBUFFER_VESA_MODE_102
|
|
||||||
default 0x103 if FRAMEBUFFER_VESA_MODE_103
|
|
||||||
default 0x104 if FRAMEBUFFER_VESA_MODE_104
|
|
||||||
default 0x105 if FRAMEBUFFER_VESA_MODE_105
|
|
||||||
default 0x106 if FRAMEBUFFER_VESA_MODE_106
|
|
||||||
default 0x107 if FRAMEBUFFER_VESA_MODE_107
|
|
||||||
default 0x108 if FRAMEBUFFER_VESA_MODE_108
|
|
||||||
default 0x109 if FRAMEBUFFER_VESA_MODE_109
|
|
||||||
default 0x10A if FRAMEBUFFER_VESA_MODE_10A
|
|
||||||
default 0x10B if FRAMEBUFFER_VESA_MODE_10B
|
|
||||||
default 0x10C if FRAMEBUFFER_VESA_MODE_10C
|
|
||||||
default 0x10D if FRAMEBUFFER_VESA_MODE_10D
|
|
||||||
default 0x10E if FRAMEBUFFER_VESA_MODE_10E
|
|
||||||
default 0x10F if FRAMEBUFFER_VESA_MODE_10F
|
|
||||||
default 0x110 if FRAMEBUFFER_VESA_MODE_110
|
|
||||||
default 0x111 if FRAMEBUFFER_VESA_MODE_111
|
|
||||||
default 0x112 if FRAMEBUFFER_VESA_MODE_112
|
|
||||||
default 0x113 if FRAMEBUFFER_VESA_MODE_113
|
|
||||||
default 0x114 if FRAMEBUFFER_VESA_MODE_114
|
|
||||||
default 0x115 if FRAMEBUFFER_VESA_MODE_115
|
|
||||||
default 0x116 if FRAMEBUFFER_VESA_MODE_116
|
|
||||||
default 0x117 if FRAMEBUFFER_VESA_MODE_117
|
|
||||||
default 0x118 if FRAMEBUFFER_VESA_MODE_118
|
|
||||||
default 0x119 if FRAMEBUFFER_VESA_MODE_119
|
|
||||||
default 0x11A if FRAMEBUFFER_VESA_MODE_11A
|
|
||||||
default 0x11B if FRAMEBUFFER_VESA_MODE_11B
|
|
||||||
default 0x117 if FRAMEBUFFER_VESA_MODE_USER
|
|
||||||
|
|
||||||
endmenu
|
|
||||||
|
|
||||||
config HAVE_FSP
|
config HAVE_FSP
|
||||||
bool "Add an Firmware Support Package binary"
|
bool "Add an Firmware Support Package binary"
|
||||||
help
|
help
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ CONFIG_VENDOR_INTEL=y
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="minnowmax"
|
CONFIG_DEFAULT_DEVICE_TREE="minnowmax"
|
||||||
CONFIG_TARGET_MINNOWMAX=y
|
CONFIG_TARGET_MINNOWMAX=y
|
||||||
CONFIG_HAVE_INTEL_ME=y
|
CONFIG_HAVE_INTEL_ME=y
|
||||||
|
CONFIG_VIDEO_VESA=y
|
||||||
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
|
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
|
||||||
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
|
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
|
||||||
CONFIG_SMP=y
|
CONFIG_SMP=y
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,144 @@ config VIDEO_VESA
|
||||||
by U-Boot. This can in principle be used with any platform that
|
by U-Boot. This can in principle be used with any platform that
|
||||||
supports PCI and video cards that support VESA BIOS Extension (VBE).
|
supports PCI and video cards that support VESA BIOS Extension (VBE).
|
||||||
|
|
||||||
|
config FRAMEBUFFER_SET_VESA_MODE
|
||||||
|
bool "Set framebuffer graphics resolution"
|
||||||
|
depends on VIDEO_VESA
|
||||||
|
help
|
||||||
|
Set VESA/native framebuffer mode (needed for bootsplash and graphical
|
||||||
|
framebuffer console)
|
||||||
|
|
||||||
|
choice
|
||||||
|
prompt "framebuffer graphics resolution"
|
||||||
|
default FRAMEBUFFER_VESA_MODE_117
|
||||||
|
depends on FRAMEBUFFER_SET_VESA_MODE
|
||||||
|
help
|
||||||
|
This option sets the resolution used for the U-Boot framebuffer (and
|
||||||
|
bootsplash screen).
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_100
|
||||||
|
bool "640x400 256-color"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_101
|
||||||
|
bool "640x480 256-color"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_102
|
||||||
|
bool "800x600 16-color"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_103
|
||||||
|
bool "800x600 256-color"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_104
|
||||||
|
bool "1024x768 16-color"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_105
|
||||||
|
bool "1024x7686 256-color"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_106
|
||||||
|
bool "1280x1024 16-color"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_107
|
||||||
|
bool "1280x1024 256-color"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_108
|
||||||
|
bool "80x60 text"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_109
|
||||||
|
bool "132x25 text"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_10A
|
||||||
|
bool "132x43 text"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_10B
|
||||||
|
bool "132x50 text"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_10C
|
||||||
|
bool "132x60 text"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_10D
|
||||||
|
bool "320x200 32k-color (1:5:5:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_10E
|
||||||
|
bool "320x200 64k-color (5:6:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_10F
|
||||||
|
bool "320x200 16.8M-color (8:8:8)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_110
|
||||||
|
bool "640x480 32k-color (1:5:5:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_111
|
||||||
|
bool "640x480 64k-color (5:6:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_112
|
||||||
|
bool "640x480 16.8M-color (8:8:8)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_113
|
||||||
|
bool "800x600 32k-color (1:5:5:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_114
|
||||||
|
bool "800x600 64k-color (5:6:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_115
|
||||||
|
bool "800x600 16.8M-color (8:8:8)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_116
|
||||||
|
bool "1024x768 32k-color (1:5:5:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_117
|
||||||
|
bool "1024x768 64k-color (5:6:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_118
|
||||||
|
bool "1024x768 16.8M-color (8:8:8)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_119
|
||||||
|
bool "1280x1024 32k-color (1:5:5:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_11A
|
||||||
|
bool "1280x1024 64k-color (5:6:5)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_11B
|
||||||
|
bool "1280x1024 16.8M-color (8:8:8)"
|
||||||
|
|
||||||
|
config FRAMEBUFFER_VESA_MODE_USER
|
||||||
|
bool "Manually select VESA mode"
|
||||||
|
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
# Map the config names to an integer (KB).
|
||||||
|
config FRAMEBUFFER_VESA_MODE
|
||||||
|
prompt "VESA mode" if FRAMEBUFFER_VESA_MODE_USER
|
||||||
|
hex
|
||||||
|
default 0x100 if FRAMEBUFFER_VESA_MODE_100
|
||||||
|
default 0x101 if FRAMEBUFFER_VESA_MODE_101
|
||||||
|
default 0x102 if FRAMEBUFFER_VESA_MODE_102
|
||||||
|
default 0x103 if FRAMEBUFFER_VESA_MODE_103
|
||||||
|
default 0x104 if FRAMEBUFFER_VESA_MODE_104
|
||||||
|
default 0x105 if FRAMEBUFFER_VESA_MODE_105
|
||||||
|
default 0x106 if FRAMEBUFFER_VESA_MODE_106
|
||||||
|
default 0x107 if FRAMEBUFFER_VESA_MODE_107
|
||||||
|
default 0x108 if FRAMEBUFFER_VESA_MODE_108
|
||||||
|
default 0x109 if FRAMEBUFFER_VESA_MODE_109
|
||||||
|
default 0x10A if FRAMEBUFFER_VESA_MODE_10A
|
||||||
|
default 0x10B if FRAMEBUFFER_VESA_MODE_10B
|
||||||
|
default 0x10C if FRAMEBUFFER_VESA_MODE_10C
|
||||||
|
default 0x10D if FRAMEBUFFER_VESA_MODE_10D
|
||||||
|
default 0x10E if FRAMEBUFFER_VESA_MODE_10E
|
||||||
|
default 0x10F if FRAMEBUFFER_VESA_MODE_10F
|
||||||
|
default 0x110 if FRAMEBUFFER_VESA_MODE_110
|
||||||
|
default 0x111 if FRAMEBUFFER_VESA_MODE_111
|
||||||
|
default 0x112 if FRAMEBUFFER_VESA_MODE_112
|
||||||
|
default 0x113 if FRAMEBUFFER_VESA_MODE_113
|
||||||
|
default 0x114 if FRAMEBUFFER_VESA_MODE_114
|
||||||
|
default 0x115 if FRAMEBUFFER_VESA_MODE_115
|
||||||
|
default 0x116 if FRAMEBUFFER_VESA_MODE_116
|
||||||
|
default 0x117 if FRAMEBUFFER_VESA_MODE_117
|
||||||
|
default 0x118 if FRAMEBUFFER_VESA_MODE_118
|
||||||
|
default 0x119 if FRAMEBUFFER_VESA_MODE_119
|
||||||
|
default 0x11A if FRAMEBUFFER_VESA_MODE_11A
|
||||||
|
default 0x11B if FRAMEBUFFER_VESA_MODE_11B
|
||||||
|
default 0x117 if FRAMEBUFFER_VESA_MODE_USER
|
||||||
|
|
||||||
config VIDEO_LCD_SSD2828
|
config VIDEO_LCD_SSD2828
|
||||||
bool "SSD2828 bridge chip"
|
bool "SSD2828 bridge chip"
|
||||||
default n
|
default n
|
||||||
|
|
|
||||||
|
|
@ -54,9 +54,6 @@
|
||||||
#define CONFIG_X86_OPTION_ROM_FILE vga.bin
|
#define CONFIG_X86_OPTION_ROM_FILE vga.bin
|
||||||
#define CONFIG_X86_OPTION_ROM_ADDR 0xfff90000
|
#define CONFIG_X86_OPTION_ROM_ADDR 0xfff90000
|
||||||
|
|
||||||
#ifndef CONFIG_SYS_COREBOOT
|
|
||||||
#define CONFIG_VIDEO_VESA
|
|
||||||
#endif
|
|
||||||
#define VIDEO_IO_OFFSET 0
|
#define VIDEO_IO_OFFSET 0
|
||||||
#define CONFIG_X86EMU_RAW_IO
|
#define CONFIG_X86EMU_RAW_IO
|
||||||
#define CONFIG_VGA_AS_SINGLE_DEVICE
|
#define CONFIG_VGA_AS_SINGLE_DEVICE
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue