[PATCH 11/15] Convert CONFIG_ATMEL_LCD et al to Kconfig

Tom Rini trini at konsulko.com
Fri Mar 18 13:38:28 CET 2022 

This converts the following to Kconfig:
   CONFIG_ATMEL_LCD
   CONFIG_ATMEL_LCD_BGR555
   CONFIG_ATMEL_LCD_RGB565
   CONFIG_GURNARD_SPLASH

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 README                                        | 4 ----
 board/bluewater/gurnard/Kconfig               | 3 +++
 configs/at91sam9261ek_dataflash_cs0_defconfig | 1 +
 configs/at91sam9261ek_dataflash_cs3_defconfig | 1 +
 configs/at91sam9261ek_nandflash_defconfig     | 1 +
 configs/at91sam9263ek_dataflash_cs0_defconfig | 1 +
 configs/at91sam9263ek_dataflash_defconfig     | 1 +
 configs/at91sam9263ek_nandflash_defconfig     | 1 +
 configs/at91sam9263ek_norflash_boot_defconfig | 1 +
 configs/at91sam9263ek_norflash_defconfig      | 1 +
 configs/gurnard_defconfig                     | 2 ++
 configs/pm9261_defconfig                      | 2 ++
 configs/pm9263_defconfig                      | 2 ++
 drivers/video/Kconfig                         | 9 +++++++++
 include/configs/at91sam9261ek.h               | 4 ----
 include/configs/at91sam9263ek.h               | 2 --
 include/configs/at91sam9m10g45ek.h            | 2 --
 include/configs/at91sam9n12ek.h               | 1 -
 include/configs/at91sam9rlek.h                | 2 --
 include/configs/pm9261.h                      | 2 --
 include/configs/pm9263.h                      | 2 --
 include/configs/snapper9g45.h                 | 4 ----
 22 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/README b/README
index 0072e03b6313..805c8f0d0487 100644
--- a/README
+++ b/README
@@ -994,10 +994,6 @@ The following options need to be configured:
 		display); also select one of the supported displays
 		by defining one of these:
 
-		CONFIG_ATMEL_LCD:
-
-			HITACHI TX09D70VM1CCA, 3.5", 240x320.
-
 		CONFIG_NEC_NL6448AC33:
 
 			NEC NL6448AC33-18. Active, color, single scan.
diff --git a/board/bluewater/gurnard/Kconfig b/board/bluewater/gurnard/Kconfig
index e2cd9f00df8e..41ecbf7e22f5 100644
--- a/board/bluewater/gurnard/Kconfig
+++ b/board/bluewater/gurnard/Kconfig
@@ -1,5 +1,8 @@
 if TARGET_GURNARD
 
+config GURNARD_SPLASH
+	def_bool y
+
 config SYS_BOARD
 	default "gurnard"
 
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 3b30a024294a..5788b9d935f9 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -64,3 +64,4 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_ATMEL_LCD_BGR555=y
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 776130ed6174..69d7931763f0 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -64,3 +64,4 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_ATMEL_LCD_BGR555=y
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index b80d5a6a5f66..32945796300a 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -62,3 +62,4 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_ATMEL_LCD_BGR555=y
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index 9de5028afa87..090ee4059835 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -68,3 +68,4 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_ATMEL_LCD_BGR555=y
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index 9de5028afa87..090ee4059835 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -68,3 +68,4 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_ATMEL_LCD_BGR555=y
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index ed12a9954fd0..82d6ecdbc505 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -66,3 +66,4 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_ATMEL_LCD_BGR555=y
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 34140444ca5e..0e96b3a9c13c 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -66,3 +66,4 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_ATMEL_LCD_BGR555=y
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index aab31afc52eb..20a105085cea 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -67,3 +67,4 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_ATMEL_LCD_BGR555=y
diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index fc6c2b96b7be..20be0e3c29d7 100644
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -59,4 +59,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_LOGO is not set
 # CONFIG_VIDEO_BPP32 is not set
+CONFIG_ATMEL_LCD=y
+CONFIG_LCD=y
 CONFIG_CMD_DHRYSTONE=y
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 7a640ff35ece..bda991795e24 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -60,5 +60,7 @@ CONFIG_DM_SPI=y
 CONFIG_USB=y
 CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
+CONFIG_ATMEL_LCD=y
+CONFIG_ATMEL_LCD_BGR555=y
 CONFIG_LCD=y
 CONFIG_REGEX=y
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index 3c5f0b73abf6..c9a8552266f8 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -64,5 +64,7 @@ CONFIG_DM_SPI=y
 CONFIG_USB=y
 CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
+CONFIG_ATMEL_LCD=y
+CONFIG_ATMEL_LCD_BGR555=y
 CONFIG_LCD=y
 CONFIG_JFFS2_NAND=y
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 646fec70262c..82d4569eab77 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -421,6 +421,15 @@ config VIDEO_LCD_ANX9804
 	from a parallel LCD interface and translate it on the fy into a DP
 	interface for driving eDP TFT displays. It uses I2C for configuration.
 
+config ATMEL_LCD
+	bool "Atmel LCD panel support"
+	depends on LCD && ARCH_AT91
+
+config ATMEL_LCD_BGR555
+	bool "Display in BGR555 mode"
+	help
+	  Use the BGR555 output mode.  Otherwise RGB565 is used.
+
 config VIDEO_LCD_ORISETECH_OTM8009A
 	bool "OTM8009A DSI LCD panel support"
 	depends on DM_VIDEO
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 0b6706b95d94..dcad025541f1 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -26,10 +26,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_LCD
-#ifdef CONFIG_AT91SAM9261EK
-#define CONFIG_ATMEL_LCD_BGR555
-#endif
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE		0x20000000
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index c48810d81252..38ca1f80237f 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -37,8 +37,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO			1
 #define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_ATMEL_LCD		1
-#define CONFIG_ATMEL_LCD_BGR555		1
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE		ATMEL_BASE_CS1
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 7e8e35b7aa6c..ffa090ac1236 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -22,8 +22,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_LCD
-#define CONFIG_ATMEL_LCD_RGB565
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE           0x70000000
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 1771defa164d..f02239c25052 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -21,7 +21,6 @@
 #define CONFIG_LCD_LOGO
 #define CONFIG_LCD_INFO
 #define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_LCD_RGB565
 
 #define CONFIG_SYS_SDRAM_BASE		0x20000000
 #define CONFIG_SYS_SDRAM_SIZE		0x08000000
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 89cfcbd9517f..369b981e3eec 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -26,8 +26,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO			1
 #define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_ATMEL_LCD		1
-#define CONFIG_ATMEL_LCD_RGB565		1
 /* Let board_init_f handle the framebuffer allocation */
 #undef CONFIG_FB_ADDR
 
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 3960a5cf96a4..fb801b3d241d 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -134,8 +134,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO			1
 #define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_ATMEL_LCD		1
-#define CONFIG_ATMEL_LCD_BGR555		1
 
 /* SDRAM */
 #define PHYS_SDRAM				0x20000000
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 8ee8bbb21921..52cc0886a65a 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -145,8 +145,6 @@
 #undef LCD_TEST_PATTERN
 #define CONFIG_LCD_INFO			1
 #define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_ATMEL_LCD		1
-#define CONFIG_ATMEL_LCD_BGR555		1
 
 #define CONFIG_LCD_IN_PSRAM		1
 
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index 9e78fd219ccd..0e3567f535b4 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -38,10 +38,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC8
 
-/* LCD */
-#define CONFIG_ATMEL_LCD
-#define CONFIG_GURNARD_SPLASH
-
 /* UARTs/Serial console */
 
 /* Boot options */
-- 
2.25.1

More information about the U-Boot mailing list