[rtems commit] bsps/arm: Fix PL111 register define re-definition

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    2cd37161039bb66d072dfc67879f23df30d12290
Changeset: http://git.rtems.org/rtems/commit/?id=2cd37161039bb66d072dfc67879f23df30d12290

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Aug 20 08:35:26 2018 +0200

bsps/arm: Fix PL111 register define re-definition

Close #3502.

---

 bsps/arm/include/bsp/arm-pl111-regs.h | 2 +-
 bsps/arm/lpc24xx/start/fb-config.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bsps/arm/include/bsp/arm-pl111-regs.h b/bsps/arm/include/bsp/arm-pl111-regs.h
index ed27ba4..f351966 100644
--- a/bsps/arm/include/bsp/arm-pl111-regs.h
+++ b/bsps/arm/include/bsp/arm-pl111-regs.h
@@ -89,7 +89,7 @@ typedef struct {
 #define PL111_LCD_CONTROL_LCD_BPP_8 0x03U
 #define PL111_LCD_CONTROL_LCD_BPP_16 0x04U
 #define PL111_LCD_CONTROL_LCD_BPP_24 0x05U
-#define PL111_LCD_CONTROL_LCD_BPP_16 0x06U
+#define PL111_LCD_CONTROL_LCD_BPP_16_5_6_5 0x06U
 #define PL111_LCD_CONTROL_LCD_BPP_12 0x07U
 #define PL111_LCD_CONTROL_LCD_BW BSP_BIT32(4)
 #define PL111_LCD_CONTROL_LCD_TFT BSP_BIT32(5)
diff --git a/bsps/arm/lpc24xx/start/fb-config.c b/bsps/arm/lpc24xx/start/fb-config.c
index d1fa33c..83c3bab 100644
--- a/bsps/arm/lpc24xx/start/fb-config.c
+++ b/bsps/arm/lpc24xx/start/fb-config.c
@@ -117,7 +117,7 @@ static const pl111_fb_config fb_config = {
     | PL111_LCD_TIMING2_PCD_HI(0x0),
   .timing3 = 0x0,
   .control = PL111_LCD_CONTROL_LCD_TFT
-    | PL111_LCD_CONTROL_LCD_BPP(PL111_LCD_CONTROL_LCD_BPP_16)
+    | PL111_LCD_CONTROL_LCD_BPP(PL111_LCD_CONTROL_LCD_BPP_16_5_6_5)
     | PL111_LCD_CONTROL_BGR,
   .power_delay_in_us = 100000,