summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-08-18 22:57:17 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-08-18 22:57:17 +0000
commit6f1d1c683c3e53619905281aa02df9588373a36e (patch)
tree3a1837d06b10e73f59d647842a091433bda334d7
parent441a901ee6d6d3d59550cb6cf05ef76bd9d555c8 (diff)
Move duplicate LCD orieations settings from configs/*/Kconfig to drivers/lcd/Kconfig
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5036 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rw-r--r--nuttx/configs/stm3210e-eval/Kconfig29
-rw-r--r--nuttx/configs/stm3220g-eval/Kconfig49
-rw-r--r--nuttx/configs/stm3240g-eval/Kconfig49
-rw-r--r--nuttx/drivers/lcd/Kconfig39
4 files changed, 42 insertions, 124 deletions
diff --git a/nuttx/configs/stm3210e-eval/Kconfig b/nuttx/configs/stm3210e-eval/Kconfig
index a40a7548ba..ba366f93d4 100644
--- a/nuttx/configs/stm3210e-eval/Kconfig
+++ b/nuttx/configs/stm3210e-eval/Kconfig
@@ -28,34 +28,7 @@ config ARCH_IRQBUTTONS
config STM3210E_LCD
bool "Select support for the STM3210E-EVAL LCD"
default y
- depends on STM32_FSMC
-
-choice
- prompt "STM3210E-EVAL LCD Orientation"
- default LCD_LANDSCAPE
- depends on STM3210E_LCD
-
-config LCD_LANDSCAPE
- bool "320x240 landscape display"
- ---help---
- Define for 320x240 display "landscape" support. Default is this 320x240
- "landscape" orientation (this setting is informative only... not used).
-
-config LCD_PORTRAIT
- bool "240x320 portrait display"
- ---help---
- Define for 240x320 display "portrait" orientation support. In this
- orientation, the STM3210E-EVAL's LCD ribbon cable is at the bottom of
- the display. Default is 320x240 "landscape" orientation.
-
-config LCD_RPORTRAIT
- bool "240x320 reverse portrait display"
- ---help---
- Define for 240x320 display "reverse portrait" orientation support. In
- this orientation, the STM3210E-EVAL's LCD ribbon cable is at the top
- of the display. Default is 320x240 "landscape" orientation.
-
-endchoice
+ depends on LCD && STM32_FSMC
config LCD_BACKLIGHT
bool "LCD backlight support"
diff --git a/nuttx/configs/stm3220g-eval/Kconfig b/nuttx/configs/stm3220g-eval/Kconfig
index e248d2e68d..200cb11c17 100644
--- a/nuttx/configs/stm3220g-eval/Kconfig
+++ b/nuttx/configs/stm3220g-eval/Kconfig
@@ -26,54 +26,7 @@ config ARCH_IRQBUTTONS
config STM3220G_LCD
bool "Select support for the STM3210E-EVAL LCD"
default y
- depends on STM32_FSMC
-
-choice
- prompt "STM3220G-EVAL LCD Orientation"
- default LCD_LANDSCAPE
- depends on STM3220G_LCD
-
-config LCD_LANDSCAPE
- bool "320x240 landscape display"
- ---help---
- Define for 320x240 display "landscape" support. Default is this 320x240
- "landscape" orientation.
-
- For the STM3220G-EVAL board, the edge opposite from the row of buttons
- is used as the top of the display in this orientation.
-
-config LCD_RLANDSCAPE
- bool "320x240 reverse landscape display"
- ---help---
- Define for 320x240 display "reverse landscape" support. Default is this 320x240
- "landscape" orientation.
-
- For the STM3220G-EVAL board, the edge next to the row of buttons
- is used as the top of the display in this orientation.
-
-config LCD_PORTRAIT
- bool "240x320 portrait display"
- ---help---
- Define for 240x320 display "portrait" orientation support. In this
- orientation, the STM3210E-EVAL's LCD ribbon cable is at the bottom of
- the display. Default is 320x240 "landscape" orientation.
-
- In this orientation, the top of the display is to the left
- of the buttons (if the board is held so that the buttons are at the
- botton of the board).
-
-config LCD_RPORTRAIT
- bool "240x320 reverse portrait display"
- ---help---
- Define for 240x320 display "reverse portrait" orientation support. In
- this orientation, the STM3210E-EVAL's LCD ribbon cable is at the top
- of the display. Default is 320x240 "landscape" orientation.
-
- In this orientation, the top of the display is to the right
- of the buttons (if the board is held so that the buttons are at the
- botton of the board).
-
-endchoice
+ depends on LCD && STM32_FSMC
config LCD_RDSHIFT
int "LCD data shift"
diff --git a/nuttx/configs/stm3240g-eval/Kconfig b/nuttx/configs/stm3240g-eval/Kconfig
index af84f91920..e3ad59df85 100644
--- a/nuttx/configs/stm3240g-eval/Kconfig
+++ b/nuttx/configs/stm3240g-eval/Kconfig
@@ -26,54 +26,7 @@ config ARCH_IRQBUTTONS
config STM3240G_LCD
bool "Select support for the STM3210E-EVAL LCD"
default y
- depends on STM32_FSMC
-
-choice
- prompt "STM3240G-EVAL LCD Orientation"
- default LCD_LANDSCAPE
- depends on STM3240G_LCD
-
-config LCD_LANDSCAPE
- bool "320x240 landscape display"
- ---help---
- Define for 320x240 display "landscape" support. Default is this 320x240
- "landscape" orientation.
-
- For the STM3240G-EVAL board, the edge opposite from the row of buttons
- is used as the top of the display in this orientation.
-
-config LCD_RLANDSCAPE
- bool "320x240 reverse landscape display"
- ---help---
- Define for 320x240 display "reverse landscape" support. Default is this 320x240
- "landscape" orientation.
-
- For the STM3240G-EVAL board, the edge next to the row of buttons
- is used as the top of the display in this orientation.
-
-config LCD_PORTRAIT
- bool "240x320 portrait display"
- ---help---
- Define for 240x320 display "portrait" orientation support. In this
- orientation, the STM3210E-EVAL's LCD ribbon cable is at the bottom of
- the display. Default is 320x240 "landscape" orientation.
-
- In this orientation, the top of the display is to the left
- of the buttons (if the board is held so that the buttons are at the
- botton of the board).
-
-config LCD_RPORTRAIT
- bool "240x320 reverse portrait display"
- ---help---
- Define for 240x320 display "reverse portrait" orientation support. In
- this orientation, the STM3210E-EVAL's LCD ribbon cable is at the top
- of the display. Default is 320x240 "landscape" orientation.
-
- In this orientation, the top of the display is to the right
- of the buttons (if the board is held so that the buttons are at the
- botton of the board).
-
-endchoice
+ depends on LCD && STM32_FSMC
config LCD_RDSHIFT
int "LCD data shift"
diff --git a/nuttx/drivers/lcd/Kconfig b/nuttx/drivers/lcd/Kconfig
index af94ac16a3..081a79c89d 100644
--- a/nuttx/drivers/lcd/Kconfig
+++ b/nuttx/drivers/lcd/Kconfig
@@ -173,3 +173,42 @@ config LCD_UG9664HSWAG01
ug-9664hswag01.c. OLED Display Module, UG-9664HSWAG01", Univision
Technology Inc. Used with the LPC Xpresso and Embedded Artists
base board.
+
+choice
+ prompt "LCD Orientation"
+ default LCD_LANDSCAPE
+ depends on LCD
+ ---help---
+ Some LCD drivers may support displays in different orientations.
+ If the LCD driver supports this capability, than these are configuration
+ options to select that display orientation.
+
+config LCD_LANDSCAPE
+ bool "Landscape orientation"
+ ---help---
+ Define for "landscape" orientation support. Landscape mode refers one
+ of two orientations where the the display is wider than it is tall
+ (LCD_RLANDSCAPE is the other). This is the default orientation.
+
+config LCD_PORTRAIT
+ bool "Portrait orientation"
+ ---help---
+ Define for "portrait" orientation support. Portrait mode refers one
+ of two orientations where the the display is taller than it is wide
+ (LCD_RPORTAIT is the other).
+
+config LCD_RPORTRAIT
+ bool "Reverse portrait display"
+ ---help---
+ Define for "reverse portrait" orientation support. Reverse portrait mode
+ refers one of two orientations where the the display is taller than it is
+ wide (LCD_PORTAIT is the other).
+
+config LCD_RLANDSCAPE
+ bool "Reverse landscape orientation"
+ ---help---
+ Define for "reverse landscape" orientation support. Reverse landscape mode
+ refers one of two orientations where the the display is wider than it is
+ tall (LCD_LANDSCAPE is the other).
+
+endchoice