Convert CONFIG_ATMEL_LCD et al to Kconfig

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@konsulko.com>

diff --git a/README b/README
index 0072e03..805c8f0 100644 (file)
--- 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 e2cd9f0..41ecbf7 100644 (file)
--- 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 3b30a02..5788b9d 100644 (file)
--- 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 776130e..69d7931 100644 (file)
--- 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 b80d5a6..3294579 100644 (file)
--- 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 9de5028..090ee40 100644 (file)
--- 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 9de5028..090ee40 100644 (file)
--- 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 ed12a99..82d6ecd 100644 (file)
--- 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 3414044..0e96b3a 100644 (file)
--- 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 aab31af..20a1050 100644 (file)
--- 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 fc6c2b9..20be0e3 100644 (file)
--- 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 7a640ff..bda9917 100644 (file)
--- 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 3c5f0b7..c9a8552 100644 (file)
--- 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 646fec7..82d4569 100644 (file)
--- 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 0b6706b..dcad025 100644 (file)
--- 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 c48810d..38ca1f8 100644 (file)
--- 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 7e8e35b..ffa090a 100644 (file)
--- 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 1771def..f02239c 100644 (file)
--- 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 89cfcbd..369b981 100644 (file)
--- 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 3960a5c..fb801b3 100644 (file)
--- 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 8ee8bbb..52cc088 100644 (file)
--- 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 9e78fd2..0e3567f 100644 (file)
--- 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 */