Skip to content
Snippets Groups Projects
Commit 983b103f authored by Simon Glass's avatar Simon Glass Committed by Tom Rini
Browse files

Convert CONFIG_SYS_WHITE_ON_BLACK to Kconfig


This converts the following to Kconfig:
   CONFIG_SYS_WHITE_ON_BLACK

Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
[trini: Make this default y on various SoCs]
Signed-off-by: default avatarTom Rini <trini@konsulko.com>
parent 4893e34b
No related branches found
No related tags found
No related merge requests found
Showing
with 17 additions and 13 deletions
...@@ -1638,9 +1638,6 @@ The following options need to be configured: ...@@ -1638,9 +1638,6 @@ The following options need to be configured:
320x240. Black & white. 320x240. Black & white.
Normally display is black on white background; define
CONFIG_SYS_WHITE_ON_BLACK to get it inverted.
CONFIG_LCD_ALIGNMENT CONFIG_LCD_ALIGNMENT
Normally the LCD is page-aligned (typically 4KB). If this is Normally the LCD is page-aligned (typically 4KB). If this is
......
...@@ -55,5 +55,6 @@ CONFIG_SYS_NS16550=y ...@@ -55,5 +55,6 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
...@@ -55,5 +55,6 @@ CONFIG_SYS_NS16550=y ...@@ -55,5 +55,6 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
...@@ -63,5 +63,6 @@ CONFIG_SYS_NS16550=y ...@@ -63,5 +63,6 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
...@@ -55,6 +55,7 @@ CONFIG_SYS_NS16550=y ...@@ -55,6 +55,7 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set
...@@ -19,6 +19,7 @@ CONFIG_MMC_SDHCI_BCM2835=y ...@@ -19,6 +19,7 @@ CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y CONFIG_USB_KEYBOARD=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y CONFIG_PHYS_TO_BUS=y
...@@ -21,6 +21,7 @@ CONFIG_MMC_SDHCI_BCM2835=y ...@@ -21,6 +21,7 @@ CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y CONFIG_USB_KEYBOARD=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y CONFIG_PHYS_TO_BUS=y
...@@ -21,6 +21,7 @@ CONFIG_MMC_SDHCI_BCM2835=y ...@@ -21,6 +21,7 @@ CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y CONFIG_USB_KEYBOARD=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y CONFIG_PHYS_TO_BUS=y
...@@ -19,6 +19,7 @@ CONFIG_MMC_SDHCI_BCM2835=y ...@@ -19,6 +19,7 @@ CONFIG_MMC_SDHCI_BCM2835=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_KEYBOARD=y CONFIG_USB_KEYBOARD=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_CONSOLE_SCROLL_LINES=10
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_PHYS_TO_BUS=y CONFIG_PHYS_TO_BUS=y
...@@ -89,6 +89,15 @@ config CONSOLE_TRUETYPE_SIZE ...@@ -89,6 +89,15 @@ config CONSOLE_TRUETYPE_SIZE
method to select the display's physical size, which would allow method to select the display's physical size, which would allow
U-Boot to calculate the correct font size. U-Boot to calculate the correct font size.
config SYS_WHITE_ON_BLACK
bool "Display console as white on a black background"
default y if ARCH_AT91 || ARCH_EXYNOS || ARCH_ROCKCHIP || TEGRA || X86
help
Normally the display is black on a white background, Enable this
option to invert this, i.e. white on a black background. This can be
better in low-light situations or to reduce eye strain in some
cases.
source "drivers/video/fonts/Kconfig" source "drivers/video/fonts/Kconfig"
config VIDCONSOLE_AS_LCD config VIDCONSOLE_AS_LCD
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#undef LCD_TEST_PATTERN #undef LCD_TEST_PATTERN
#define CONFIG_LCD_INFO #define CONFIG_LCD_INFO
#define CONFIG_LCD_INFO_BELOW_LOGO #define CONFIG_LCD_INFO_BELOW_LOGO
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_ATMEL_LCD #define CONFIG_ATMEL_LCD
#ifdef CONFIG_AT91SAM9261EK #ifdef CONFIG_AT91SAM9261EK
#define CONFIG_ATMEL_LCD_BGR555 #define CONFIG_ATMEL_LCD_BGR555
......
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
#undef LCD_TEST_PATTERN #undef LCD_TEST_PATTERN
#define CONFIG_LCD_INFO 1 #define CONFIG_LCD_INFO 1
#define CONFIG_LCD_INFO_BELOW_LOGO 1 #define CONFIG_LCD_INFO_BELOW_LOGO 1
#define CONFIG_SYS_WHITE_ON_BLACK 1
#define CONFIG_ATMEL_LCD 1 #define CONFIG_ATMEL_LCD 1
#define CONFIG_ATMEL_LCD_BGR555 1 #define CONFIG_ATMEL_LCD_BGR555 1
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#undef LCD_TEST_PATTERN #undef LCD_TEST_PATTERN
#define CONFIG_LCD_INFO #define CONFIG_LCD_INFO
#define CONFIG_LCD_INFO_BELOW_LOGO #define CONFIG_LCD_INFO_BELOW_LOGO
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_ATMEL_LCD #define CONFIG_ATMEL_LCD
#define CONFIG_ATMEL_LCD_RGB565 #define CONFIG_ATMEL_LCD_RGB565
/* board specific(not enough SRAM) */ /* board specific(not enough SRAM) */
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#define CONFIG_LCD_LOGO #define CONFIG_LCD_LOGO
#define CONFIG_LCD_INFO #define CONFIG_LCD_INFO
#define CONFIG_LCD_INFO_BELOW_LOGO #define CONFIG_LCD_INFO_BELOW_LOGO
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_HLCD
#define CONFIG_ATMEL_LCD_RGB565 #define CONFIG_ATMEL_LCD_RGB565
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#undef LCD_TEST_PATTERN #undef LCD_TEST_PATTERN
#define CONFIG_LCD_INFO 1 #define CONFIG_LCD_INFO 1
#define CONFIG_LCD_INFO_BELOW_LOGO 1 #define CONFIG_LCD_INFO_BELOW_LOGO 1
#define CONFIG_SYS_WHITE_ON_BLACK 1
#define CONFIG_ATMEL_LCD 1 #define CONFIG_ATMEL_LCD 1
#define CONFIG_ATMEL_LCD_RGB565 1 #define CONFIG_ATMEL_LCD_RGB565 1
/* Let board_init_f handle the framebuffer allocation */ /* Let board_init_f handle the framebuffer allocation */
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#define CONFIG_LCD_LOGO #define CONFIG_LCD_LOGO
#define CONFIG_LCD_INFO #define CONFIG_LCD_INFO
#define CONFIG_LCD_INFO_BELOW_LOGO #define CONFIG_LCD_INFO_BELOW_LOGO
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_HLCD
#define CONFIG_ATMEL_LCD_RGB565 #define CONFIG_ATMEL_LCD_RGB565
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define CONFIG_AM335X_LCD #define CONFIG_AM335X_LCD
#define CONFIG_LCD_ROTATION #define CONFIG_LCD_ROTATION
#define CONFIG_LCD_DT_SIMPLEFB #define CONFIG_LCD_DT_SIMPLEFB
#define CONFIG_SYS_WHITE_ON_BLACK
#define LCD_BPP LCD_COLOR32 #define LCD_BPP LCD_COLOR32
#define CONFIG_HW_WATCHDOG #define CONFIG_HW_WATCHDOG
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#define CONFIG_AM335X_LCD #define CONFIG_AM335X_LCD
#define CONFIG_LCD_NOSTDOUT #define CONFIG_LCD_NOSTDOUT
#define CONFIG_SYS_WHITE_ON_BLACK
#define LCD_BPP LCD_COLOR32 #define LCD_BPP LCD_COLOR32
#define CONFIG_VIDEO_BMP_GZIP #define CONFIG_VIDEO_BMP_GZIP
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
#ifdef CONFIG_LCD #ifdef CONFIG_LCD
#define CONFIG_PXA_LCD #define CONFIG_PXA_LCD
#define CONFIG_PXA_VGA #define CONFIG_PXA_VGA
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_LCD_LOGO #define CONFIG_LCD_LOGO
#endif #endif
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#define CONFIG_TFTP_TSIZE #define CONFIG_TFTP_TSIZE
/* LCD support */ /* LCD support */
#define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_LCD_LOGO #define CONFIG_LCD_LOGO
/* NAND support */ /* NAND support */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment