diff --git a/README b/README
index 616dd5e348d2bf0da6fe5b90ec5305a9faee773e..3afffbde1c5ce99575cae1131a96e185fabe8668 100644
--- a/README
+++ b/README
@@ -1638,9 +1638,6 @@ The following options need to be configured:
 
 			320x240. Black & white.
 
-		Normally display is black on white background; define
-		CONFIG_SYS_WHITE_ON_BLACK to get it inverted.
-
 		CONFIG_LCD_ALIGNMENT
 
 		Normally the LCD is page-aligned (typically 4KB). If this is
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 621d7dbb43392555673eeeaf052080a1ffb6cc3d..7d92c139402a7170b284811d4d528c5ad9717b7e 100644
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -55,5 +55,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index a974e680a9e4c3276cfd65dc19500f148e42031c..9abe61760e1012fbc443b630d7fa30dbc2b0166e 100644
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -55,5 +55,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index d1a786a90ff062a12667121b553eb961a18a6440..79bb9057bfc2bc902fea8c75d05629bfcb4e18f5 100644
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -63,5 +63,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 9616d9bc2c00ce12845eaaeda2aee30ad4f90dcb..940793b5a672166499e9e7c6cbcc0239e2479294 100644
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -55,6 +55,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 9d669c92e42535ceb3f382e5ec93a164c9eb52b5..9875f5d295008d176d12671ac40d0c228e01d1d4 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -19,6 +19,7 @@ CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index d0f7beaa0b3e371c982b0e584584d8563aa16fea..e4a81b882d1f65a249e1394b66bcd4acbd0d8d6f 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -21,6 +21,7 @@ CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index ce28c312832efe9f4e2d1a9c174be6f5b2f3e64d..e0be6c76f8fc23a2dacbcc6b59feec18315c0f1b 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -21,6 +21,7 @@ CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 4a90ca8348612f188ed03516cf06c9fcb0c81780..a07d69800ce0606041e351ee3f914c00ed4f9278 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -19,6 +19,7 @@ CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_LCD=y
 CONFIG_PHYS_TO_BUS=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 19e97452bda4f025266e77fb9c6526362a0e956a..e29c3fcfc6de816a061e883877d8fb14997718ed 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -89,6 +89,15 @@ config CONSOLE_TRUETYPE_SIZE
 	  method to select the display's physical size, which would allow
 	  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"
 
 config VIDCONSOLE_AS_LCD
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 0afc92c91de39314c2ad7f599f113bb384bc9421..505f945bd313ec6b31719daf663b0ef1ee77e19b 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -51,7 +51,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_LCD
 #ifdef CONFIG_AT91SAM9261EK
 #define CONFIG_ATMEL_LCD_BGR555
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 51941312437e449dbf2265719906a63a11c11dc5..663c193a5b0514513d96842d7dc2b0705eb5adc9 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -59,7 +59,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO			1
 #define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_SYS_WHITE_ON_BLACK	1
 #define CONFIG_ATMEL_LCD		1
 #define CONFIG_ATMEL_LCD_BGR555		1
 
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 0708d536623de42f380c2bc8119dbb1fe281e483..a62b70b4596259d00deda3e284f279ea1b14c92e 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -44,7 +44,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_LCD
 #define CONFIG_ATMEL_LCD_RGB565
 /* board specific(not enough SRAM) */
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 872d471d055674bb4ac1169dd0443c56540e7227..dd49f4ebd3a9fa20c3de7a1dcfc9596efdef8d09 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -42,7 +42,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
 
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 8752f1f3b61144ce7e93f38353239cc4c8742999..31a7cb18d86df613e95423466add05cc2b5ee2e0 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -47,7 +47,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO			1
 #define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_SYS_WHITE_ON_BLACK	1
 #define CONFIG_ATMEL_LCD		1
 #define CONFIG_ATMEL_LCD_RGB565		1
 /* Let board_init_f handle the framebuffer allocation */
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index c81003e311676ed85c5d2034efc21588f5057261..ff0a78ba4373ec85939058fbd3ef95769b883654 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -39,7 +39,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
 
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 68e9efef1c254edb1f09ae2ef9991000c24a773a..0c1a54d7ba2e6ba4ab0ca33076df2ac42f68e3aa 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -18,7 +18,6 @@
 #define CONFIG_AM335X_LCD
 #define CONFIG_LCD_ROTATION
 #define CONFIG_LCD_DT_SIMPLEFB
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define LCD_BPP				LCD_COLOR32
 
 #define CONFIG_HW_WATCHDOG
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 49aea8f1962b2c464955570832dec5ce130af6c2..49f223a32aaac10775b993037f32d6980afa4ec2 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -17,7 +17,6 @@
 /* ------------------------------------------------------------------------- */
 #define CONFIG_AM335X_LCD
 #define CONFIG_LCD_NOSTDOUT
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define LCD_BPP				LCD_COLOR32
 
 #define CONFIG_VIDEO_BMP_GZIP
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 0dbd996920b298031eff5ac749ed3dfebfd083ed..62a404a7b1d671c4df1254a5fe7bd1d9ede7a06e 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -65,7 +65,6 @@
 #ifdef CONFIG_LCD
 #define CONFIG_PXA_LCD
 #define CONFIG_PXA_VGA
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_LCD_LOGO
 #endif
 
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 743f92c9627ff6c59185b5fa6d9818f8036c30f0..023e75cf33d1348e8f9987e5db3cf638063c1c7f 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -39,7 +39,6 @@
 #define CONFIG_TFTP_TSIZE
 
 /* LCD support */
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_LCD_LOGO
 
 /* NAND support */
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h
index bbd54a1160f6eace27e385b0c4a382c6fa4a9394..0dc3532f330e9107ef37f31dd2e4ac6da2bc56fa 100644
--- a/include/configs/evb_rk3288.h
+++ b/include/configs/evb_rk3288.h
@@ -13,6 +13,4 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h
index 3a39a1bffe50b4eccf40584087b828f706dc7763..fe3ec8c1778e76015fc5124bf7bcdf0e644aae4b 100644
--- a/include/configs/evb_rk3328.h
+++ b/include/configs/evb_rk3328.h
@@ -20,7 +20,6 @@
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_CONSOLE_SCROLL_LINES		10
 
 #endif
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
index 8fdefa29c7298711f7c3cf2016a991685fc75a0e..b9fd5b417a7528256bcd6dd03a9a4f598a7fa8ac 100644
--- a/include/configs/evb_rk3399.h
+++ b/include/configs/evb_rk3399.h
@@ -20,6 +20,4 @@
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
index 7cb3a296b572b5d150f30e0370827479ae9f7cfb..1b94d07f6745b59caf135c9da33f342e66d209a0 100644
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -31,7 +31,6 @@
 #define CONFIG_EXYNOS_FB
 #define CONFIG_EXYNOS_DP
 #define LCD_BPP			LCD_COLOR16
-#define CONFIG_SYS_WHITE_ON_BLACK
 #endif
 
 /* Enable keyboard */
diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h
index bbd54a1160f6eace27e385b0c4a382c6fa4a9394..0dc3532f330e9107ef37f31dd2e4ac6da2bc56fa 100644
--- a/include/configs/fennec_rk3288.h
+++ b/include/configs/fennec_rk3288.h
@@ -13,6 +13,4 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index ec555dd9667b274193a2c520ca8c8c24789c772f..b4dcf23b1cf324f2b7e17ca57d266627e3ca59f6 100644
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -17,6 +17,4 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 923c38f96857e838db8ca17086e77aa7e14b95d3..1a5d4b1dd5d058a4a6b173f18766da88c874901b 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -45,11 +45,6 @@
 #define CONFIG_USB_ETHER_MCS7830
 #define CONFIG_USB_ETHER_SMSC95XX
 
-/* General networking support */
-
-/* LCD support */
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 342bcf3051d094fabc734235c345dc2cc02e1228..b9b666fd3e430c79e05af5953395938cf6f9b5d7 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -36,11 +36,6 @@
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
 
-/* General networking support */
-
-/* LCD support */
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/miqi_rk3288.h b/include/configs/miqi_rk3288.h
index f6860424995fcdb73f367cc52e447b6c16537242..477f296542da1ac3ad1798190b85f50065bbe379 100644
--- a/include/configs/miqi_rk3288.h
+++ b/include/configs/miqi_rk3288.h
@@ -17,6 +17,4 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index 38bb6f343c6f7ea2edfad5c0bbc89df3b86b376a..d9d4f2d5837cd2df2561286315cd547ebd9545e2 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -30,9 +30,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		2
 #define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE)
 
-/* LCD support */
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 /* Align LCD to 1MB boundary */
 #define CONFIG_LCD_ALIGNMENT	MMU_SECTION_SIZE
 
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index fe7be6983dbad78fb60ff5d3b1ce2b2316b37461..2e8cbd94cf627e660fc769d6549d5228f8a81aef 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -36,11 +36,6 @@
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 
-/* General networking support */
-
-/* LCD support */
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 61c4b98b1dcfca5a88c03380a6cbdc6cc0a5781e..733768aa7b2d240117d3c7c181bae1f20adc771c 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -47,7 +47,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_LCD
 #define CONFIG_ATMEL_LCD_RGB565
 /* board specific(not enough SRAM) */
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index ca1404ae9fc6162ff8ffdb191e76dcbca62d27fe..b22a3b6a2bfe0270f8a5ac7a63f5e34eadb926a2 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -152,7 +152,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO			1
 #define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_SYS_WHITE_ON_BLACK	1
 #define CONFIG_ATMEL_LCD		1
 #define CONFIG_ATMEL_LCD_BGR555		1
 
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 52791bce555bcf65beecc77e0a3db1998cd3b653..b220d14dd86807f065034ebc8f4ee13ad607f198 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -165,7 +165,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO			1
 #define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_SYS_WHITE_ON_BLACK	1
 #define CONFIG_ATMEL_LCD		1
 #define CONFIG_ATMEL_LCD_BGR555		1
 
diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h
index bbd54a1160f6eace27e385b0c4a382c6fa4a9394..0dc3532f330e9107ef37f31dd2e4ac6da2bc56fa 100644
--- a/include/configs/popmetal_rk3288.h
+++ b/include/configs/popmetal_rk3288.h
@@ -13,6 +13,4 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h
index fd62c72a203bed671bf188b4175f544578c59fdf..f7787443195d61b95f33bad3580b4d8edbf2ea34 100644
--- a/include/configs/puma_rk3399.h
+++ b/include/configs/puma_rk3399.h
@@ -22,6 +22,4 @@
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index ec555dd9667b274193a2c520ca8c8c24789c772f..b4dcf23b1cf324f2b7e17ca57d266627e3ca59f6 100644
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -17,6 +17,4 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 244f5101974057305cb6b17c5f93e489af08a686..5caf90a9ac2f3078889c2ffb51f4bdb890ce23bc 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -76,7 +76,6 @@
  */
 #define CONFIG_FB_ADDR			0
 #define CONFIG_VIDEO_BCM2835
-#define CONFIG_SYS_WHITE_ON_BLACK
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 627a3411969ac7fb22eef37654b25ea5b21ec715..6c75626e8249ba127bcda9b1df4d2fc7b2474609 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -190,7 +190,6 @@ int universal_spi_read(void);
 
 /* LCD console */
 #define LCD_BPP			LCD_COLOR16
-#define CONFIG_SYS_WHITE_ON_BLACK
 
 /*
  * LCD Settings
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index ccbcc765c3c49584f2b12b62124eadf665ce9903..ea28fce6ef8b3c209a19a3283df3caccddd34187 100644
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -61,7 +61,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
 #endif
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 6c28c4c19eb5bf5ef45e965744e73c1adb22a406..509457b9bf0ea9e7e7340f217641ca7a33e72b00 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -34,7 +34,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
 
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index aced293fa8493a493d7cf59f29af2b1d9a4d2196..c584b0b9e3f96a26755a1afb63383c2073b467de 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -54,7 +54,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
 #endif
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index a5fd37f46b207c9c3e1d50f5dcd9dff087c8c89b..91f286b64777659d0d8920b576e3ea71279fe793 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -53,7 +53,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_SYS_WHITE_ON_BLACK
 #define CONFIG_ATMEL_HLCD
 #define CONFIG_ATMEL_LCD_RGB565
 
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index 661d1fee6f8735e72b8d3b02e71dc79ef06639d6..207b59118d0bd65f0be7d31a3313652201055b22 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -44,17 +44,10 @@
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 
-/* General networking support */
-
 /* Enable keyboard */
 #define CONFIG_TEGRA_KEYBOARD
 #define CONFIG_KEYBOARD
 
-/* USB keyboard */
-
-/* LCD support */
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 /* NAND support */
 #define CONFIG_CMD_NAND
 #define CONFIG_TEGRA_NAND
diff --git a/include/configs/tec.h b/include/configs/tec.h
index ebfca8f3199b995d10a8894840b9145276502f14..b380a69bdf751c242ba4620f4a232e46045cde27 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -36,11 +36,6 @@
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
 
-/* General networking support */
-
-/* LCD support */
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
index 402ae2def22a8454b71422fd0eb223e46a4faf54..72578f9202baa549cdd402f91e51b02a0ffca587 100644
--- a/include/configs/tinker_rk3288.h
+++ b/include/configs/tinker_rk3288.h
@@ -21,6 +21,4 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 1
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 1e68c032428cffd06b1c9226edf8c585d551d84d..6806cd9565034fb02929a6edf3b12608693ef4f7 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -202,7 +202,6 @@
 
 /* LCD console */
 #define LCD_BPP			LCD_COLOR16
-#define CONFIG_SYS_WHITE_ON_BLACK
 
 /* LCD */
 #define CONFIG_BMP_16BPP
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 722d492518f4bdd852121b3800a84e38bb5dd685..6a4604ce938c56c2beff3448374e13d29c58e8be 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -183,7 +183,6 @@
 
 /* LCD console */
 #define LCD_BPP                 LCD_COLOR16
-#define CONFIG_SYS_WHITE_ON_BLACK
 
 /* LCD */
 #define CONFIG_BMP_16BPP
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 87b5136facbbb508fe7a493f0a91aaa62976be70..0e851a1b10863f36fe64e3dd9bcd9a3c969741b1 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -34,13 +34,6 @@
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 
-/* General networking support */
-
-/* USB keyboard */
-
-/* LCD support */
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #include "tegra-common-post.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/veyron.h b/include/configs/veyron.h
index b15cc26bebc961238adcee2e67ffa329eb0196be..3bd8dd60b5b772a12b165e78477c35b3ef72af38 100644
--- a/include/configs/veyron.h
+++ b/include/configs/veyron.h
@@ -22,6 +22,4 @@
 
 #define CONFIG_KEYBOARD
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #endif
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index e8ad29d3d093e8d4cd1b3862e643978daba3f2ea..b0e7e8115f78d0c0f163e3bc1648e84dbaa5f92e 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -46,8 +46,6 @@
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET		0x003f8000
 
-#define CONFIG_SYS_WHITE_ON_BLACK
-
 #define CONFIG_STD_DEVICES_SETTINGS	"stdin=usbkbd,i8042-kbd,serial\0" \
 					"stdout=vidconsole,serial\0" \
 					"stderr=vidconsole,serial\0"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index df115d1106c4ee4407ed8d6eaa48bb5d36033340..58e1522e6f4fe97225883bc5f0c502c0dad8f796 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -6229,7 +6229,6 @@ CONFIG_SYS_WDTC_WDMR_VAL
 CONFIG_SYS_WDTTIMERBASE
 CONFIG_SYS_WDT_PERIOD_HIGH
 CONFIG_SYS_WDT_PERIOD_LOW
-CONFIG_SYS_WHITE_ON_BLACK
 CONFIG_SYS_WINDOW1_BASE
 CONFIG_SYS_WRITE_SWAPPED_DATA
 CONFIG_SYS_XHCI_USB1_ADDR