From 6e6350e1c60b4510d03560a7112dad3a05eccd25 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 10 Nov 2013 16:16:33 -0600 Subject: [PATCH] SAMA5 LCD: Fix some bad color format definitions --- arch/arm/src/sama5/sam_lcd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c index f7e0cac722..70556820db 100644 --- a/arch/arm/src/sama5/sam_lcd.c +++ b/arch/arm/src/sama5/sam_lcd.c @@ -116,10 +116,10 @@ # define SAMA5_LCDC_BASE_COLOR_FMT FB_FMT_RGB12_444 #elif defined(CONFIG_SAMA5_LCDC_BASE_RGB888P) # define SAMA5_LCDC_BASE_BPP 24 -# define SAMA5_LCDC_BASE_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_BASE_COLOR_FMT FB_FMT_RGB24 #elif defined(CONFIG_SAMA5_LCDC_BASE_TRGB1888) # define SAMA5_LCDC_BASE_BPP 32 /* 25BPP but must be byte aligned */ -# define SAMA5_LCDC_BASE_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_BASE_COLOR_FMT ??? #elif defined(CONFIG_SAMA5_LCDC_BASE_ARGB8888) # define SAMA5_LCDC_BASE_BPP 32 # define SAMA5_LCDC_BASE_COLOR_FMT ??? @@ -162,10 +162,10 @@ # define SAMA5_LCDC_OVR1_COLOR_FMT FB_FMT_RGB12_444 #elif defined(CONFIG_SAMA5_LCDC_OVR1_RGB888P) # define SAMA5_LCDC_OVR1_BPP 24 -# define SAMA5_LCDC_OVR1_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_OVR1_COLOR_FMT FB_FMT_RGB24 #elif defined(CONFIG_SAMA5_LCDC_OVR1_TRGB1888) # define SAMA5_LCDC_OVR1_BPP 32 /* 25BPP but must be byte aligned */ -# define SAMA5_LCDC_OVR1_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_OVR1_COLOR_FMT ??? #elif defined(CONFIG_SAMA5_LCDC_OVR1_ARGB8888) # define SAMA5_LCDC_OVR1_BPP 32 # define SAMA5_LCDC_OVR1_COLOR_FMT ??? @@ -208,10 +208,10 @@ # define SAMA5_LCDC_OVR2_COLOR_FMT FB_FMT_RGB12_444 #elif defined(CONFIG_SAMA5_LCDC_OVR2_RGB888P) # define SAMA5_LCDC_OVR2_BPP 24 -# define SAMA5_LCDC_OVR2_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_OVR2_COLOR_FMT FB_FMT_RGB24 #elif defined(CONFIG_SAMA5_LCDC_OVR2_TRGB1888) # define SAMA5_LCDC_OVR2_BPP 32 /* 25BPP but must be byte aligned */ -# define SAMA5_LCDC_OVR2_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_OVR2_COLOR_FMT ??? #elif defined(CONFIG_SAMA5_LCDC_OVR2_ARGB8888) # define SAMA5_LCDC_OVR2_BPP 32 # define SAMA5_LCDC_OVR2_COLOR_FMT ??? @@ -254,10 +254,10 @@ # define SAMA5_LCDC_HEO_COLOR_FMT FB_FMT_RGB12_444 #elif defined(CONFIG_SAMA5_LCDC_HEO_RGB888P) # define SAMA5_LCDC_HEO_BPP 24 -# define SAMA5_LCDC_HEO_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_HEO_COLOR_FMT FB_FMT_RGB24 #elif defined(CONFIG_SAMA5_LCDC_HEO_TRGB1888) # define SAMA5_LCDC_HEO_BPP 32 /* 25BPP but must be byte aligned */ -# define SAMA5_LCDC_HEO_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_HEO_COLOR_FMT ??? #elif defined(CONFIG_SAMA5_LCDC_HEO_ARGB8888) # define SAMA5_LCDC_HEO_BPP 32 # define SAMA5_LCDC_HEO_COLOR_FMT ??? @@ -300,10 +300,10 @@ # define SAMA5_LCDC_HCR_COLOR_FMT FB_FMT_RGB12_444 #elif defined(CONFIG_SAMA5_LCDC_HCR_RGB888P) # define SAMA5_LCDC_HCR_BPP 24 -# define SAMA5_LCDC_HCR_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_HCR_COLOR_FMT FB_FMT_RGB24 #elif defined(CONFIG_SAMA5_LCDC_HCR_TRGB1888) # define SAMA5_LCDC_HCR_BPP 32 /* 25BPP but must be byte aligned */ -# define SAMA5_LCDC_HCR_COLOR_FMT FB_FMT_RGB12_444 +# define SAMA5_LCDC_HCR_COLOR_FMT ??? #elif defined(CONFIG_SAMA5_LCDC_HCR_ARGB8888) # define SAMA5_LCDC_HCR_BPP 32 # define SAMA5_LCDC_HCR_COLOR_FMT ???