diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-08-18 22:57:17 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-08-18 22:57:17 +0000 |
commit | ba31404b97b156e018fe1dc3ae0f28e4a8e080a2 (patch) | |
tree | 3a1837d06b10e73f59d647842a091433bda334d7 /nuttx | |
parent | 756715d077f25572078733d07f5b9192ab17a9eb (diff) | |
download | px4-firmware-ba31404b97b156e018fe1dc3ae0f28e4a8e080a2.tar.gz px4-firmware-ba31404b97b156e018fe1dc3ae0f28e4a8e080a2.tar.bz2 px4-firmware-ba31404b97b156e018fe1dc3ae0f28e4a8e080a2.zip |
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
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/configs/stm3210e-eval/Kconfig | 29 | ||||
-rw-r--r-- | nuttx/configs/stm3220g-eval/Kconfig | 49 | ||||
-rw-r--r-- | nuttx/configs/stm3240g-eval/Kconfig | 49 | ||||
-rw-r--r-- | nuttx/drivers/lcd/Kconfig | 39 |
4 files changed, 42 insertions, 124 deletions
diff --git a/nuttx/configs/stm3210e-eval/Kconfig b/nuttx/configs/stm3210e-eval/Kconfig index a40a7548b..ba366f93d 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 e248d2e68..200cb11c1 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 af84f9192..e3ad59df8 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 af94ac16a..081a79c89 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 |