From 02dcedfaf7833da6d64812967908c445d6e5b051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20B=C4=83l=C4=83nic=C4=83?= Date: Mon, 20 Jan 2025 15:22:49 +0200 Subject: [PATCH] Clean up global BuildOptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mario Bălănică --- .../LcdGraphicsOutputDxe.c | 2 -- .../Silicon/Rockchip/Drivers/OhciDxe/Ohci.c | 23 ------------------- .../Rockchip/Drivers/RkFvbDxe/RkFvbDxe.c | 2 +- .../Rockchip/Library/DisplayLib/DwDpLib.c | 2 +- .../Rockchip/Library/DisplayLib/DwDpLib.inf | 3 +++ .../Library/DisplayLib/DwMipiDsi2Lib.inf | 5 ++-- .../RK3588/Drivers/UsbDpPhyDxe/UsbDpPhyDxe.c | 2 +- .../Silicon/Rockchip/Rockchip.dsc.inc | 4 +--- .../Drivers/DwMmcHcDxe/DwMmcHcDxe.c | 1 - .../DesignWare/Drivers/DwMmcHcDxe/DwMmcHci.c | 2 -- 10 files changed, 10 insertions(+), 36 deletions(-) diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/edk2-rockchip/Silicon/Rockchip/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c index 29295bc12..23c2fce49 100644 --- a/edk2-rockchip/Silicon/Rockchip/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c +++ b/edk2-rockchip/Silicon/Rockchip/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c @@ -266,8 +266,6 @@ LcdGraphicsOutputInit ( UINTN ConnectorCount; EFI_HANDLE *ConnectorHandles; UINTN Index; - UINT32 HorizontalResolution; - UINT32 VerticalResolution; Status = LcdInstanceContructor (&Instance); if (EFI_ERROR (Status)) { diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/Ohci.c b/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/Ohci.c index b2936d076..db6ff4cb0 100644 --- a/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/Ohci.c +++ b/edk2-rockchip/Silicon/Rockchip/Drivers/OhciDxe/Ohci.c @@ -9,29 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "Ohci.h" -STATIC OHCI_DEVICE_PATH OhciDevicePathProtocol = { - { - { - HARDWARE_DEVICE_PATH, - HW_VENDOR_DP, - { - (UINT8)(OFFSET_OF (OHCI_DEVICE_PATH, End)), - (UINT8)(OFFSET_OF (OHCI_DEVICE_PATH, End) >> 8), - }, - }, - EFI_CALLER_ID_GUID - }, - 0, // Instance - { - END_DEVICE_PATH_TYPE, - END_ENTIRE_DEVICE_PATH_SUBTYPE, - { - sizeof (EFI_DEVICE_PATH_PROTOCOL), - 0 - } - } -}; - /** Provides software reset for the USB host controller. diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/RkFvbDxe/RkFvbDxe.c b/edk2-rockchip/Silicon/Rockchip/Drivers/RkFvbDxe/RkFvbDxe.c index 5930f4b10..ec5c05509 100644 --- a/edk2-rockchip/Silicon/Rockchip/Drivers/RkFvbDxe/RkFvbDxe.c +++ b/edk2-rockchip/Silicon/Rockchip/Drivers/RkFvbDxe/RkFvbDxe.c @@ -1055,7 +1055,7 @@ FvbConfigureFlashInstance ( { EFI_STATUS Status; UINTN DataOffset; - UINTN VariableSize, FtwWorkingSize, FtwSpareSize, MemorySize; + UINTN VariableSize, FtwWorkingSize, FtwSpareSize; // Locate SPI protocols Status = gBS->LocateProtocol ( diff --git a/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwDpLib.c b/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwDpLib.c index fd90c8110..e554ab37c 100644 --- a/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwDpLib.c +++ b/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwDpLib.c @@ -1406,7 +1406,7 @@ static int dw_dp_connector_init(ROCKCHIP_CONNECTOR_PROTOCOL *conn, DISPLAY_STATE { CONNECTOR_STATE *conn_state = &state->ConnectorState; struct dw_dp *dp = DW_DP_FROM_CONNECTOR_PROTOCOL (conn); - int ret; + int ret = 0; conn_state->OutputInterface |= dp->id ? VOP_OUTPUT_IF_DP1 : VOP_OUTPUT_IF_DP0; conn_state->OutputMode = ROCKCHIP_OUT_MODE_AAAA; diff --git a/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwDpLib.inf b/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwDpLib.inf index 11e3dcfb4..b8b450488 100644 --- a/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwDpLib.inf +++ b/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwDpLib.inf @@ -46,5 +46,8 @@ gRockchipConnectorProtocolGuid ## PRODUCES gDpPhyProtocolGuid ## CONSUMES +[BuildOptions] + GCC:*_*_AARCH64_CC_FLAGS = -Wno-error=unused-function -Wno-error=unused-variable + [Depex] TRUE diff --git a/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwMipiDsi2Lib.inf b/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwMipiDsi2Lib.inf index b1e448751..65e250c22 100644 --- a/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwMipiDsi2Lib.inf +++ b/edk2-rockchip/Silicon/Rockchip/Library/DisplayLib/DwMipiDsi2Lib.inf @@ -41,13 +41,14 @@ Silicon/Rockchip/RockchipPkg.dec Silicon/Rockchip/RK3588/RK3588.dec -[BuildOptions] - [Pcd] [Protocols] gRockchipConnectorProtocolGuid ## PRODUCES gRockchipDsiPanelProtocolGuid ## CONSUMES +[BuildOptions] + GCC:*_*_AARCH64_CC_FLAGS = -Wno-error=unused-function -Wno-error=unused-variable + [Depex] TRUE diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/Drivers/UsbDpPhyDxe/UsbDpPhyDxe.c b/edk2-rockchip/Silicon/Rockchip/RK3588/Drivers/UsbDpPhyDxe/UsbDpPhyDxe.c index 81d0ed95a..8329bf3d4 100644 --- a/edk2-rockchip/Silicon/Rockchip/RK3588/Drivers/UsbDpPhyDxe/UsbDpPhyDxe.c +++ b/edk2-rockchip/Silicon/Rockchip/RK3588/Drivers/UsbDpPhyDxe/UsbDpPhyDxe.c @@ -538,7 +538,7 @@ static int udphy_disable(struct rockchip_udphy *udphy) static int udphy_parse_lane_mux_data(struct rockchip_udphy *udphy, UINT8 *prop, UINTN num_lanes) { - int ret, i; + int i; if (!prop) { dev_dbg(udphy->dev, diff --git a/edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc b/edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc index ac81837f9..b68c0b689 100644 --- a/edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc +++ b/edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc @@ -356,9 +356,7 @@ FspiLib|Silicon/Rockchip/Library/FspiLib/FspiLib.inf ################################################################################################### [BuildOptions] -# RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG - *_*_*_CC_FLAGS = -DDEFAULT_DARK - GCC:*_*_AARCH64_CC_FLAGS = -Wno-error=uninitialized -Wno-error=stringop-overflow -Wno-error=unused-function -Wno-error=unused-variable + GCC:*_*_AARCH64_CC_FLAGS = -Wno-error=unused-function # Compile with symbols to support overlays. *_*_*_DTC_FLAGS = -@ diff --git a/edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHcDxe.c b/edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHcDxe.c index 3a1f345ce..509270318 100644 --- a/edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHcDxe.c +++ b/edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHcDxe.c @@ -609,7 +609,6 @@ DwMmcHcDriverBindingStart ( NON_DISCOVERABLE_DEVICE *Dev; - BOOLEAN MediaPresent; DWMMC_CARD_TYPE_DETECT_ROUTINE *Routine; UINT8 Index; UINT32 RoutineNum; diff --git a/edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHci.c b/edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHci.c index b4b5f2ba5..ed640ab52 100644 --- a/edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHci.c +++ b/edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHci.c @@ -595,8 +595,6 @@ DwMmcHcStartDma ( UINTN DevBase; UINT32 Ctrl; UINT32 Bmod; - UINT32 Timeout; - UINT32 Data; // DevIo = Trb->Private->DevIo; DevBase = Trb->Private->DevBase;