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 0072e03b6313399e5cda7b1e9a0b7f33b4f81827..805c8f0d0487da140b0a5029cf81ee02a1579ea5 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 e2cd9f00df8e6d8fa7d1e9bc6b0fa5403371963e..41ecbf7e22f50c1b5d42355ddcb1b2b5be8ecdbe 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 3b30a024294ae65e464e640d824f0eff3536e5a6..5788b9d935f91c06d361a040edb049875f444f6e 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 776130ed617481403386db3e77a0de09c489ebcc..69d7931763f00fb0751165e7b817fca16be814b7 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 b80d5a6a5f66139d5ae45142c0f3c6b4ad4c9a83..32945796300a9ce0fc4f7e6bbfa9194b4cec1ecc 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 9de5028afa87b8e5a88d6fb657d54cde5bec79b0..090ee405983580c1a7e04899d3e334268e952b3c 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 9de5028afa87b8e5a88d6fb657d54cde5bec79b0..090ee405983580c1a7e04899d3e334268e952b3c 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 ed12a9954fd087a4ce3294e8146505a8fdfd77eb..82d6ecdbc505290bf01e0e32a1d895f92cbdd2f0 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 34140444ca5ea86e4a900f368eb8dc18dffe3f58..0e96b3a9c13c1b1b64e8daedf32ed46acef5f1e0 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 aab31afc52ebd9e12b4b67364cdb29eb41521016..20a105085cea5deb9dbb246e66980a2adebe0068 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 fc6c2b96b7bea6ea0567d24ccc8a6728fd2720e7..20be0e3c29d7784eaa17bc3b8d7719d1f84319bf 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 7a640ff35eceeada785f790718a855c21415bd8d..bda991795e24059e826b12a3197a574f44faad80 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 3c5f0b73abf6c333e68c2543d35811a1203e3186..c9a8552266f898eadbb505d5e6f3082a3f9f1bb3 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 646fec70262c5fef18eaf66d559d8aef862d8fe8..82d4569eab773ef5c15c58b5ffb8dca0a5f8ee4c 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 0b6706b95d943c4bb87b96991c1e888076697368..dcad025541f1e7a90c2f599815fdfa95119af027 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 c48810d812523f0c50d0c53116421cd4ae3b6e6b..38ca1f80237f401131d01c22ea19553aa8923054 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 7e8e35b7aa6c98d4c0077784397672e98fea78c7..ffa090ac12360fead6f9d4c48b682ec16da4a476 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 1771defa164d1069591eb1bc5f5c2fcb83fc318a..f02239c250527a6c22c57fedd04ee47f3ff77c24 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 89cfcbd9517fc5328c040562b8fa36b028167765..369b981e3eec8e4d87a24be08b12d92bce5ed3e7 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 3960a5cf96a447e0f478edc1ec0487ec50c806f1..fb801b3d241d0653879f50306d6c4ae4731190e1 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 8ee8bbb21921eec46a9ca13daf376aa44ab40630..52cc0886a65a28926eecb71e8303a18bae131a8d 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 9e78fd219ccd65ece5576ebe8b59a4ebdbe16afe..0e3567f535b4efbc5cbf6cb35ac24e6f4b07d2df 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 */