SAMA5 LCDC: Default resolution if now RGB565; Add option to select a different output resolution than the sofware resolution (needs to the 24BPP for this LCD).

This commit is contained in:
Gregory Nutt 2013-10-10 18:41:42 -06:00
parent b641545f93
commit de5ae1a584
2 changed files with 33 additions and 11 deletions

View File

@ -326,6 +326,24 @@ config SAMA5_LCDC_BACKCOLOR
hex "Background color"
default 0x0
choice
prompt "Output resolution"
default SAMA5_LCDC_OUTPUT_24BPP
config SAMA5_LCDC_OUTPUT_12BPP
bool "12BPP"
config SAMA5_LCDC_OUTPUT_16BPP
bool "16BPP"
config SAMA5_LCDC_OUTPUT_18BPP
bool "18BPP"
config SAMA5_LCDC_OUTPUT_24BPP
bool "24BPP"
endchoice # Output resolution
choice
prompt "Frame buffer allocation strategy"
default SAMA5_LCDC_FBALLOCATED
@ -391,7 +409,7 @@ endchoice # Base layer rotation
choice
prompt "Base layer color format"
default SAMA5_LCDC_BASE_RGB888P
default SAMA5_LCDC_BASE_RGB565
config SAMA5_LCDC_BASE_RGB444
bool "12 bpp RGB 444"
@ -480,7 +498,7 @@ endchoice # Overlay 1 rotation
choice
prompt "Overlay 1 color format"
default SAMA5_LCDC_OVR1_RGB888P
default SAMA5_LCDC_OVR1_RGB565
config SAMA5_LCDC_OVR1_RGB444
bool "12 bpp RGB 444"
@ -570,7 +588,7 @@ endchoice # Overlay 2 rotation
choice
prompt "Overlay 2 layer color format"
default SAMA5_LCDC_OVR2_RGB888P
default SAMA5_LCDC_OVR2_RGB565
config SAMA5_LCDC_OVR2_RGB444
bool "12 bpp RGB 444"
@ -660,7 +678,7 @@ endchoice # HEO layer rotation
choice
prompt "HEO layer color format"
default SAMA5_LCDC_HEO_RGB888P
default SAMA5_LCDC_HEO_RGB565
config SAMA5_LCDC_HEO_RGB444
bool "12 bpp RGB 444"
@ -742,7 +760,7 @@ endchoice # Hardware cursor rotation
choice
prompt "Hardware cursor layer color format"
default SAMA5_LCDC_HCR_RGB888P
default SAMA5_LCDC_HCR_RGB565
config SAMA5_LCDC_HCR_RGB444
bool "12 bpp RGB 444"

View File

@ -175,7 +175,11 @@ CONFIG_SAMA5_MPDDRC=y
#
CONFIG_SAMA5_LCDC_BACKLIGHT=y
CONFIG_SAMA5_LCDC_DEFBACKLIGHT=0xf0
CONFIG_SAMA5_LCDC_BACKCOLOR=0x007b68ee
CONFIG_SAMA5_LCDC_BACKCOLOR=0x7b5d
# CONFIG_SAMA5_LCDC_OUTPUT_12BPP is not set
# CONFIG_SAMA5_LCDC_OUTPUT_16BPP is not set
# CONFIG_SAMA5_LCDC_OUTPUT_18BPP is not set
CONFIG_SAMA5_LCDC_OUTPUT_24BPP=y
# CONFIG_SAMA5_LCDC_FBALLOCATED is not set
CONFIG_SAMA5_LCDC_FBFIXED=y
# CONFIG_SAMA5_LCDC_FBPREALLOCATED is not set
@ -192,14 +196,14 @@ CONFIG_SAMA5_LCDC_BASE_ROT0=y
# CONFIG_SAMA5_LCDC_BASE_RGB444 is not set
# CONFIG_SAMA5_LCDC_BASE_ARGB4444 is not set
# CONFIG_SAMA5_LCDC_BASE_RGBA4444 is not set
# CONFIG_SAMA5_LCDC_BASE_RGB565 is not set
CONFIG_SAMA5_LCDC_BASE_RGB565=y
# CONFIG_SAMA5_LCDC_BASE_TRGB1555 is not set
# CONFIG_SAMA5_LCDC_BASE_RGB666 is not set
# CONFIG_SAMA5_LCDC_BASE_RGB666P is not set
# CONFIG_SAMA5_LCDC_BASE_TRGB1666 is not set
# CONFIG_SAMA5_LCDC_BASE_TRGBP is not set
# CONFIG_SAMA5_LCDC_BASE_RGB888 is not set
CONFIG_SAMA5_LCDC_BASE_RGB888P=y
# CONFIG_SAMA5_LCDC_BASE_RGB888P is not set
# CONFIG_SAMA5_LCDC_BASE_TRGB1888 is not set
# CONFIG_SAMA5_LCDC_BASE_ARGB8888 is not set
# CONFIG_SAMA5_LCDC_BASE_RGBA8888 is not set
@ -469,8 +473,8 @@ CONFIG_NX_DISABLE_1BPP=y
CONFIG_NX_DISABLE_2BPP=y
CONFIG_NX_DISABLE_4BPP=y
CONFIG_NX_DISABLE_8BPP=y
CONFIG_NX_DISABLE_16BPP=y
# CONFIG_NX_DISABLE_24BPP is not set
# CONFIG_NX_DISABLE_16BPP is not set
CONFIG_NX_DISABLE_24BPP=y
CONFIG_NX_DISABLE_32BPP=y
CONFIG_NX_PACKEDMSFIRST=y
@ -624,7 +628,7 @@ CONFIG_EXAMPLES_NX_VPLANE=0
CONFIG_EXAMPLES_NX_DEVNO=0
CONFIG_EXAMPLES_NX_DEFAULT_COLORS=y
CONFIG_EXAMPLES_NX_DEFAULT_FONT=y
CONFIG_EXAMPLES_NX_BPP=24
CONFIG_EXAMPLES_NX_BPP=16
# CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
# CONFIG_EXAMPLES_NX_EXTERNINIT is not set
# CONFIG_EXAMPLES_NXCONSOLE is not set