public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io, ard.biesheuvel@arm.com,
	thomas.abraham@arm.com, leif@nuviainc.com
Cc: sami.mujawar@arm.com
Subject: [PATCH v2 edk2-platforms 1/2] Platform/ARM/VExpressPkg: Remove LcdPlatformLib.h
Date: Fri, 11 Dec 2020 10:38:26 +0000	[thread overview]
Message-ID: <20201211103827.5820-2-Pierre.Gondois@arm.com> (raw)
In-Reply-To: <20201211103827.5820-1-Pierre.Gondois@arm.com>

From: Pierre Gondois <Pierre.Gondois@arm.com>

LcdPlatformLib.h was introduced by 8ad58788b5c3 as a duplicate
of the edk2 original file at:
edk2/ArmPlatformPkg/Include/Library/LcdPlatformLib.h

The list of files in edk2-plarforms currently using LcdPlatformLib.h
is the following:
Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgi.c:11
Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c
Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpress.c
Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.c
Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJuno.c

They are all using the SCAN_TIMINGS structure. However, this structure
is only defined in the original file in the edk2 repository. Thus,
the edk2-platforms is un-used and can be safely removed.

The build system prefers the edk2 version of the file over its
edk2-platforms copy due to the .dec files order in
each .inf file where the the library is used.

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
The changes can be seen at: https://github.com/PierreARM/edk2-platforms/tree/pg/1537_Ecc_ArmPlatformPkg_v2

Notes:
    v2:
     -Remove reference to LcdPlatformLib.h in .dec file
      [asked by Ard]

 Platform/ARM/VExpressPkg/ArmVExpressPkg.dec   |   3 +-
 .../Include/Library/LcdPlatformLib.h          | 215 ------------------
 2 files changed, 1 insertion(+), 217 deletions(-)
 delete mode 100644 Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h

diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
index f78c5ce7c764..848510bff17e 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
@@ -1,7 +1,7 @@
 #/** @file
 # Arm Versatile Express package.
 #
-#  Copyright (c) 2012-2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2012-2020, Arm Limited. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -27,7 +27,6 @@ [Includes.common]

 [LibraryClasses]
   ArmPlatformSysConfigLib|Include/Library/ArmPlatformSysConfigLib.h
-  LcdPlatformLib|Include/Library/LcdPlatformLib.h

 [Guids.common]
   gArmVExpressTokenSpaceGuid    =  { 0x9c0aaed4, 0x74c5, 0x4043, { 0xb4, 0x17, 0xa3, 0x22, 0x38, 0x14, 0xce, 0x76 } }
diff --git a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h b/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h
deleted file mode 100644
index 5591147313ac..000000000000
--- a/Platform/ARM/VExpressPkg/Include/Library/LcdPlatformLib.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/** @file
-
- Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
- **/
-
-#ifndef __LCDPLATFORMLIB_H
-#define __LCDPLATFORMLIB_H
-
-#include <Protocol/GraphicsOutput.h>
-
-#define LCD_VRAM_SIZE                     SIZE_8MB
-
-//
-// Modes definitions
-//
-#define VGA                               0
-#define SVGA                              1
-#define XGA                               2
-#define SXGA                              3
-#define WSXGA                             4
-#define UXGA                              5
-#define HD                                6
-
-//
-// VGA Mode: 640 x 480
-//
-#define VGA_H_RES_PIXELS                  640
-#define VGA_V_RES_PIXELS                  480
-#define VGA_OSC_FREQUENCY                 23750000  /* 0x016A6570 */
-
-#define VGA_H_SYNC                        ( 80 - 1)
-#define VGA_H_FRONT_PORCH                 ( 16 - 1)
-#define VGA_H_BACK_PORCH                  ( 64 - 1)
-
-#define VGA_V_SYNC                        (  4 - 1)
-#define VGA_V_FRONT_PORCH                 (  3 - 1)
-#define VGA_V_BACK_PORCH                  ( 13 - 1)
-
-//
-// SVGA Mode: 800 x 600
-//
-#define SVGA_H_RES_PIXELS                 800
-#define SVGA_V_RES_PIXELS                 600
-#define SVGA_OSC_FREQUENCY                38250000  /* 0x0247A610 */
-
-#define SVGA_H_SYNC                       ( 80 - 1)
-#define SVGA_H_FRONT_PORCH                ( 32 - 1)
-#define SVGA_H_BACK_PORCH                 (112 - 1)
-
-#define SVGA_V_SYNC                       (  4 - 1)
-#define SVGA_V_FRONT_PORCH                (  3 - 1)
-#define SVGA_V_BACK_PORCH                 ( 17 - 1)
-
-//
-// XGA Mode: 1024 x 768
-//
-#define XGA_H_RES_PIXELS                  1024
-#define XGA_V_RES_PIXELS                  768
-#define XGA_OSC_FREQUENCY                 63500000  /* 0x03C8EEE0 */
-
-#define XGA_H_SYNC                        (104 - 1)
-#define XGA_H_FRONT_PORCH                 ( 48 - 1)
-#define XGA_H_BACK_PORCH                  (152 - 1)
-
-#define XGA_V_SYNC                        (  4 - 1)
-#define XGA_V_FRONT_PORCH                 (  3 - 1)
-#define XGA_V_BACK_PORCH                  ( 23 - 1)
-
-//
-// SXGA Mode: 1280 x 1024
-//
-#define SXGA_H_RES_PIXELS                 1280
-#define SXGA_V_RES_PIXELS                 1024
-#define SXGA_OSC_FREQUENCY                109000000  /* 0x067F3540 */
-
-#define SXGA_H_SYNC                       (136 - 1)
-#define SXGA_H_FRONT_PORCH                ( 80 - 1)
-#define SXGA_H_BACK_PORCH                 (216 - 1)
-
-#define SXGA_V_SYNC                       (  7 - 1)
-#define SXGA_V_FRONT_PORCH                (  3 - 1)
-#define SXGA_V_BACK_PORCH                 ( 29 - 1)
-
-//
-// WSXGA+ Mode: 1680 x 1050
-//
-#define WSXGA_H_RES_PIXELS                1680
-#define WSXGA_V_RES_PIXELS                1050
-#define WSXGA_OSC_FREQUENCY               147000000  /* 0x08C30AC0 */
-
-#define WSXGA_H_SYNC                      (170 - 1)
-#define WSXGA_H_FRONT_PORCH               (104 - 1)
-#define WSXGA_H_BACK_PORCH                (274 - 1)
-
-#define WSXGA_V_SYNC                      (  5 - 1)
-#define WSXGA_V_FRONT_PORCH               (  4 - 1)
-#define WSXGA_V_BACK_PORCH                ( 41 - 1)
-
-//
-// UXGA Mode: 1600 x 1200
-//
-#define UXGA_H_RES_PIXELS                 1600
-#define UXGA_V_RES_PIXELS                 1200
-#define UXGA_OSC_FREQUENCY                161000000  /* 0x0998AA40 */
-
-#define UXGA_H_SYNC                       (168 - 1)
-#define UXGA_H_FRONT_PORCH                (112 - 1)
-#define UXGA_H_BACK_PORCH                 (280 - 1)
-
-#define UXGA_V_SYNC                       (  4 - 1)
-#define UXGA_V_FRONT_PORCH                (  3 - 1)
-#define UXGA_V_BACK_PORCH                 ( 38 - 1)
-
-//
-// HD Mode: 1920 x 1080
-//
-#define HD_H_RES_PIXELS                   1920
-#define HD_V_RES_PIXELS                   1080
-#define HD_OSC_FREQUENCY                  165000000  /* 0x09D5B340 */
-
-#define HD_H_SYNC                         ( 79 - 1)
-#define HD_H_FRONT_PORCH                  (128 - 1)
-#define HD_H_BACK_PORCH                   (328 - 1)
-
-#define HD_V_SYNC                         (  5 - 1)
-#define HD_V_FRONT_PORCH                  (  3 - 1)
-#define HD_V_BACK_PORCH                   ( 32 - 1)
-
-//
-// Colour Masks
-//
-
-#define LCD_24BPP_RED_MASK              0x00FF0000
-#define LCD_24BPP_GREEN_MASK            0x0000FF00
-#define LCD_24BPP_BLUE_MASK             0x000000FF
-#define LCD_24BPP_RESERVED_MASK         0xFF000000
-
-#define LCD_16BPP_555_RED_MASK          0x00007C00
-#define LCD_16BPP_555_GREEN_MASK        0x000003E0
-#define LCD_16BPP_555_BLUE_MASK         0x0000001F
-#define LCD_16BPP_555_RESERVED_MASK     0x00000000
-
-#define LCD_16BPP_565_RED_MASK          0x0000F800
-#define LCD_16BPP_565_GREEN_MASK        0x000007E0
-#define LCD_16BPP_565_BLUE_MASK         0x0000001F
-#define LCD_16BPP_565_RESERVED_MASK     0x00008000
-
-#define LCD_12BPP_444_RED_MASK          0x00000F00
-#define LCD_12BPP_444_GREEN_MASK        0x000000F0
-#define LCD_12BPP_444_BLUE_MASK         0x0000000F
-#define LCD_12BPP_444_RESERVED_MASK     0x0000F000
-
-
-// The enumeration indexes maps the PL111 LcdBpp values used in the LCD Control Register
-typedef enum {
-  LCD_BITS_PER_PIXEL_1 = 0,
-  LCD_BITS_PER_PIXEL_2,
-  LCD_BITS_PER_PIXEL_4,
-  LCD_BITS_PER_PIXEL_8,
-  LCD_BITS_PER_PIXEL_16_555,
-  LCD_BITS_PER_PIXEL_24,
-  LCD_BITS_PER_PIXEL_16_565,
-  LCD_BITS_PER_PIXEL_12_444
-} LCD_BPP;
-
-
-EFI_STATUS
-LcdPlatformInitializeDisplay (
-  IN EFI_HANDLE   Handle
-  );
-
-EFI_STATUS
-LcdPlatformGetVram (
-  OUT EFI_PHYSICAL_ADDRESS*                 VramBaseAddress,
-  OUT UINTN*                                VramSize
-  );
-
-UINT32
-LcdPlatformGetMaxMode (
-  VOID
-  );
-
-EFI_STATUS
-LcdPlatformSetMode (
-  IN UINT32                                 ModeNumber
-  );
-
-EFI_STATUS
-LcdPlatformQueryMode (
-  IN  UINT32                                ModeNumber,
-  OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info
-  );
-
-EFI_STATUS
-LcdPlatformGetTimings (
-  IN  UINT32                              ModeNumber,
-  OUT UINT32*                             HRes,
-  OUT UINT32*                             HSync,
-  OUT UINT32*                             HBackPorch,
-  OUT UINT32*                             HFrontPorch,
-  OUT UINT32*                             VRes,
-  OUT UINT32*                             VSync,
-  OUT UINT32*                             VBackPorch,
-  OUT UINT32*                             VFrontPorch
-  );
-
-EFI_STATUS
-LcdPlatformGetBpp (
-  IN  UINT32                                ModeNumber,
-  OUT LCD_BPP*                              Bpp
-  );
-
-#endif
--
2.17.1


  reply	other threads:[~2020-12-11 10:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-11 10:38 [PATCH v2 edk2-platforms 0/2] Fix Ecc reported errors from ArmPlatformPkg PierreGondois
2020-12-11 10:38 ` PierreGondois [this message]
2020-12-11 10:38 ` [PATCH v2 edk2-platforms 2/2] Platform/ARM: Fix Ecc error 8005 PierreGondois
2021-01-04 17:49 ` [PATCH v2 edk2-platforms 0/2] Fix Ecc reported errors from ArmPlatformPkg Ard Biesheuvel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201211103827.5820-2-Pierre.Gondois@arm.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox