summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-07-10 12:23:41 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-07-10 12:23:41 -0600
commitfd6fe76c6ca0f3c6ada8cb0d7b70a502856789da (patch)
tree5ea5dc52a5ff014e6397b2182634edf87ae696bc
parent929a5e7e0682c06a97c77f752fd26eb85e31bcb0 (diff)
downloadpx4-nuttx-fd6fe76c6ca0f3c6ada8cb0d7b70a502856789da.tar.gz
px4-nuttx-fd6fe76c6ca0f3c6ada8cb0d7b70a502856789da.tar.bz2
px4-nuttx-fd6fe76c6ca0f3c6ada8cb0d7b70a502856789da.zip
SAMA5D4-EK LCD: Actual hardware with appears to be RGB888
-rw-r--r--nuttx/arch/arm/src/sama5/sam_lcd.c10
-rw-r--r--nuttx/configs/sama5d4-ek/include/board.h5
2 files changed, 9 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/sama5/sam_lcd.c b/nuttx/arch/arm/src/sama5/sam_lcd.c
index d8ce51b71..8674368ef 100644
--- a/nuttx/arch/arm/src/sama5/sam_lcd.c
+++ b/nuttx/arch/arm/src/sama5/sam_lcd.c
@@ -2067,7 +2067,7 @@ static void sam_layer_color(void)
LCDC_BASECFG1_16BPP_RGB565);
#else
-# error Support for this resolution is not yet supported
+# error Support for this resolution is not yet implemented
#endif
#ifdef CONFIG_SAMA5_LCDC_OVR1
@@ -2096,7 +2096,7 @@ static void sam_layer_color(void)
LCDC_OVR1CFG9_GA(0xff) | LCDC_OVR1CFG9_GAEN);
# else
-# error Support for this resolution is not yet supported
+# error Support for this resolution is not yet implemented
# endif
#endif
@@ -2126,7 +2126,7 @@ static void sam_layer_color(void)
LCDC_OVR2CFG9_GA(0xff) | LCDC_OVR2CFG9_GAEN);
# else
-# error Support for this resolution is not yet supported
+# error Support for this resolution is not yet implemented
# endif
#endif
@@ -2156,7 +2156,7 @@ static void sam_layer_color(void)
LCDC_HEOCFG9_GA(0xff) | LCDC_HEOCFG9_GAEN);
# else
-# error Support for this resolution is not yet supported
+# error Support for this resolution is not yet implemented
# endif
#endif
@@ -2190,7 +2190,7 @@ static void sam_layer_color(void)
LCDC_HCRCFG9_GA(0xff) | LCDC_HCRCFG9_GAEN);
# else
-# error Support for this resolution is not yet supported
+# error Support for this resolution is not yet implemented
# endif
#endif
#endif
diff --git a/nuttx/configs/sama5d4-ek/include/board.h b/nuttx/configs/sama5d4-ek/include/board.h
index 0baf6fa8c..d11d15871 100644
--- a/nuttx/configs/sama5d4-ek/include/board.h
+++ b/nuttx/configs/sama5d4-ek/include/board.h
@@ -168,8 +168,11 @@
#define BUTTON_USER_BIT (1 << BUTTON_USER)
/* LCD Interface, Geometry and Timing ***********************************************/
+/* This configuration applies only to the TM7000 LCD/Touchscreen module. Other LCDs
+ * will require changes.
+ */
-#define BOARD_LCDC_OUTPUT_BPP 18 /* Output format to H/W is 18BPP RGB666 */
+#define BOARD_LCDC_OUTPUT_BPP 24 /* Output format to H/W is 24BPP RGB888 */
#define BOARD_LCDC_WIDTH 800 /* Display width (pixels) */
#define BOARD_LCDC_HEIGHT 480 /* Display height (rows) */
#undef BOARD_LCDC_MCK_MUL2 /* Source clock is Mck (vs 2*Mck) */