Convert CONFIG_LCD_INFO et al to Kconfig

This converts the following to Kconfig:
   CONFIG_LCD_INFO
   CONFIG_LCD_LOGO
   CONFIG_LCD_INFO_BELOW_LOGO
   CONFIG_LCD_IN_PSRAM

Cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/ronetix/pm9263/Kconfig b/board/ronetix/pm9263/Kconfig
index 5b47d3484503afdf0e7fa10216249269c4c586cf..d6b8cacef553d744ad071c2de5c9eafaaf682413 100644 (file)
--- a/board/ronetix/pm9263/Kconfig
+++ b/board/ronetix/pm9263/Kconfig
@@ -1,5 +1,8 @@
 if TARGET_PM9263
 
+config LCD_IN_PSRAM
+       def_bool y
+
 config SYS_BOARD
        default "pm9263"
 

diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index bda991795e24059e826b12a3197a574f44faad80..8e5ebaa50b33aac8a615be49abcffa3d1edd78b6 100644 (file)
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -63,4 +63,6 @@ CONFIG_DM_VIDEO=y
 CONFIG_ATMEL_LCD=y
 CONFIG_ATMEL_LCD_BGR555=y
 CONFIG_LCD=y
+CONFIG_LCD_INFO=y
+CONFIG_LCD_LOGO=y
 CONFIG_REGEX=y

diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index c9a8552266f898eadbb505d5e6f3082a3f9f1bb3..2f8380d10a13cc7a2d243d8d49b90affb2064b1a 100644 (file)
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -67,4 +67,6 @@ CONFIG_DM_VIDEO=y
 CONFIG_ATMEL_LCD=y
 CONFIG_ATMEL_LCD_BGR555=y
 CONFIG_LCD=y
+CONFIG_LCD_INFO=y
+CONFIG_LCD_LOGO=y
 CONFIG_JFFS2_NAND=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 82d4569eab773ef5c15c58b5ffb8dca0a5f8ee4c..1bf7f4a80842b24179cd1ca6926787cd8daf7b1f 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -828,6 +828,18 @@ config LCD
          CONFIG option. See the README for details. Drives which have been
          converted to driver model will instead used CONFIG_DM_VIDEO.
 
+config LCD_INFO
+       bool "Show LCD info on-screen"
+       depends on LCD
+
+config LCD_LOGO
+       bool "Show a logo on screen"
+       depends on LCD
+
+config LCD_INFO_BELOW_LOGO
+       bool "Show LCD info below the on-screen logo"
+       depends on LCD_INFO && LCD_LOGO
+
 config VIDEO_DW_HDMI
        bool
        help

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index dcad025541f1e7a90c2f599815fdfa95119af027..4f43736fc8b643bc7955862bb7e77e22c4ef136c 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -22,10 +22,7 @@
 
 /* LCD */
 #define LCD_BPP                                LCD_COLOR8
-#define CONFIG_LCD_LOGO
 #undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x20000000

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 38ca1f80237f401131d01c22ea19553aa8923054..b5ac6a48a8f258262174dd378a9fd5ad55eca182 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -33,10 +33,7 @@
 
 /* LCD */
 #define LCD_BPP                                LCD_COLOR8
-#define CONFIG_LCD_LOGO                        1
 #undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO                        1
-#define CONFIG_LCD_INFO_BELOW_LOGO     1
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1

diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index ffa090ac12360fead6f9d4c48b682ec16da4a476..f24e7d65313cb2917d7e1786cc585b6e8fbc6441 100644 (file)
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -18,10 +18,7 @@
 
 /* LCD */
 #define LCD_BPP                                LCD_COLOR8
-#define CONFIG_LCD_LOGO
 #undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE           0x70000000

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index f02239c250527a6c22c57fedd04ee47f3ff77c24..cd7c271cdc75b077ad9ce8698bd25cc0ba6dcf01 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -18,9 +18,6 @@
 /* LCD */
 #define LCD_BPP                                LCD_COLOR16
 #define LCD_OUTPUT_BPP                 24
-#define CONFIG_LCD_LOGO
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
 
 #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 369b981e3eec8e4d87a24be08b12d92bce5ed3e7..822df8eb89fd2a789f74dfc39a30d72e0d54292f 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -22,10 +22,7 @@
 
 /* LCD */
 #define LCD_BPP                                LCD_COLOR8
-#define CONFIG_LCD_LOGO                        1
 #undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO                        1
-#define CONFIG_LCD_INFO_BELOW_LOGO     1
 /* Let board_init_f handle the framebuffer allocation */
 #undef CONFIG_FB_ADDR
 

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index b34a5c9f2422e9fc5112e5cc9b127329b729c97a..17ff703d74bc1d26da19df1df1a3bce307485c26 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -38,7 +38,6 @@
 #ifdef CONFIG_LCD
 #define CONFIG_PXA_LCD
 #define CONFIG_PXA_VGA
-#define CONFIG_LCD_LOGO
 #endif
 
 /*

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index c377187b803c452c21a1577cc3cf909fb36d9309..c45016a83583bb848ec7bb07609dfec99816a386 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -15,9 +15,6 @@
 #define CONFIG_TEGRA_UARTA_SDIO1
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
-/* LCD support */
-#define CONFIG_LCD_LOGO
-
 /* NAND support */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index fb801b3d241d0653879f50306d6c4ae4731190e1..056d87488c02c13acdfa2ace7c172a5cf71538a3 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -130,10 +130,7 @@
 
 /* LCD */
 #define LCD_BPP                                LCD_COLOR8
-#define CONFIG_LCD_LOGO                        1
 #undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO                        1
-#define CONFIG_LCD_INFO_BELOW_LOGO     1
 
 /* SDRAM */
 #define PHYS_SDRAM                             0x20000000

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 52cc0886a65a28926eecb71e8303a18bae131a8d..7b32e1b75bc5c517c8458bc779365a5bc8e8c0a0 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -141,12 +141,7 @@
  */
 /* LCD */
 #define LCD_BPP                                LCD_COLOR8
-#define CONFIG_LCD_LOGO                        1
 #undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO                        1
-#define CONFIG_LCD_INFO_BELOW_LOGO     1
-
-#define CONFIG_LCD_IN_PSRAM            1
 
 /* SDRAM */
 #define PHYS_SDRAM             0x20000000