From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by mx.groups.io with SMTP id smtpd.web12.57040.1583763698238007630 for ; Mon, 09 Mar 2020 07:21:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=WZmY2YLS; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.208.67, mailfrom: pete@akeo.ie) Received: by mail-ed1-f67.google.com with SMTP id g19so12183295eds.11 for ; Mon, 09 Mar 2020 07:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8s/YCbqT8pgAlhHQCndEj4rMFEHJ+N69mPUgTRZzlcQ=; b=WZmY2YLSao3FssdTgvNUGCQQi7RwN23IlbapVqVLrfU6ZGQzJoLIwthnFscqm/J1ug tacMg/DoW6KEqlqGuh+bAbQ6FYJIx8fj2jET8nrEJvAaMhAbrEzb2Yg4bLf/tsdtZ0Az VUJiIgadtq+26SX6huglWiDb0fkJcsBNUNrSAAzegkEnWUUumOe1dM2FhJ2FosArAXcp G5b0CFEDnKs2zEd10JAFlXbtpJ5fB+OK3NZWp8ZzXgYNnOTw0CyXFLBdMKyEXloHMrB3 v+44BpO8REmXRmnevCNMDEajNLdHMD5RXQ9g7hH95zPVpoElWNtl3yQiLQeTxBUiSsWM teLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8s/YCbqT8pgAlhHQCndEj4rMFEHJ+N69mPUgTRZzlcQ=; b=LBN/V6HFCHVwN52R+kFs/HZpRgL5gxm9e3RQrAsFXs7w3vNRly55AYiiGPiOt8P+W8 KOIo8HFqbC8swqOFtztKY3+m1XRpm4j3YXO0D8p84g70cSP3RqmJx3GVC93NB4jS8QaX TAwdJJixrTAn2Keq82xgMnj08K062dsA8Ci546VAcD+V3mtKoz9sle968/IpmPRlF1Ca mwZ4fiqFKeyD52qlxjXHrAmowH2guwOy3KqA8teAU80rFkekUq26Fpip6bJpgQW7EeBA UeSGrrPLog9uvN9wQqy58uluNCKt0EIX13pOyWpPpYfELriDPrhuxT5rqYvw04kTofNX FuXg== X-Gm-Message-State: ANhLgQ1uRxan67m8JYygy+2B9HIdrstKYC9njEz/+EcNBzmQVbk6vkUN /Ni45ZuJKXm7h/Vnw3ExPIYE7gZAjDs= X-Google-Smtp-Source: ADFU+vuO9bpuoDu3qy615odHUTU/Gx9LiIkODHVs5BjdPaOX5IQDW3NzjqUazqpCozpghxoJ5KNGnA== X-Received: by 2002:a17:906:53ce:: with SMTP id p14mr14883369ejo.212.1583763696388; Mon, 09 Mar 2020 07:21:36 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.66.228]) by smtp.gmail.com with ESMTPSA id r23sm3901569edx.24.2020.03.09.07.21.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Mar 2020 07:21:35 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif@nuviainc.com, philmd@redhat.com, awarkentin@vmware.com Subject: [edk2-devel][PATCH 2/2] Platform/RPi/ConfigDxe: Fix a compilation warning Date: Mon, 9 Mar 2020 14:21:19 +0000 Message-Id: <20200309142119.7260-3-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200309142119.7260-1-pete@akeo.ie> References: <20200309142119.7260-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This fixes "WARNING: default value re-defined with different value" being produced when trying to set default values for the Scaled VModes in ConfigDxeHii.vfr. This warning is generated regardless of what the default value is being set to and since we don't actually care about setting a default value, as long as the PCD is properly set, we choose to simply remove the default. We also ensure that all the PCDs are set to the expected default value. Signed-off-by: Pete Batard --- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr | 6 ------ Platform/RaspberryPi/RPi3/RPi3.dsc | 2 +- Platform/RaspberryPi/RPi4/RPi4.dsc | 2 +- Platform/RaspberryPi/RaspberryPi.dec | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr index 2a15e0f5096e..10c9e646f621 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr @@ -365,42 +365,36 @@ formset prompt = STRING_TOKEN(STR_DISPLAY_VMODES_640_PROMPT), help = STRING_TOKEN(STR_DISPLAY_VMODES_640_HELP), flags = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG | RESET_REQUIRED, - default = TRUE, endcheckbox; checkbox varid = DisplayEnableScaledVModes.v800, prompt = STRING_TOKEN(STR_DISPLAY_VMODES_800_PROMPT), help = STRING_TOKEN(STR_DISPLAY_VMODES_800_HELP), flags = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG | RESET_REQUIRED, - default = TRUE, endcheckbox; checkbox varid = DisplayEnableScaledVModes.v1024, prompt = STRING_TOKEN(STR_DISPLAY_VMODES_1024_PROMPT), help = STRING_TOKEN(STR_DISPLAY_VMODES_1024_HELP), flags = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG | RESET_REQUIRED, - default = TRUE, endcheckbox; checkbox varid = DisplayEnableScaledVModes.v720p, prompt = STRING_TOKEN(STR_DISPLAY_VMODES_720_PROMPT), help = STRING_TOKEN(STR_DISPLAY_VMODES_720_HELP), flags = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG | RESET_REQUIRED, - default = TRUE, endcheckbox; checkbox varid = DisplayEnableScaledVModes.v1080p, prompt = STRING_TOKEN(STR_DISPLAY_VMODES_1080_PROMPT), help = STRING_TOKEN(STR_DISPLAY_VMODES_1080_HELP), flags = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG | RESET_REQUIRED, - default = TRUE, endcheckbox; checkbox varid = DisplayEnableScaledVModes.Physical, prompt = STRING_TOKEN(STR_DISPLAY_VMODES_REAL_PROMPT), help = STRING_TOKEN(STR_DISPLAY_VMODES_REAL_HELP), flags = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG | RESET_REQUIRED, - default = TRUE, endcheckbox; oneof varid = DisplayEnableSShot.Enable, diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 91d5738afbc6..8266a92f3958 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -436,7 +436,7 @@ [PcdsDynamicHii.common.DEFAULT] # # Display-related. # - gRaspberryPiTokenSpaceGuid.PcdDisplayEnableScaledVModes|L"DisplayEnableScaledVModes"|gConfigDxeFormSetGuid|0x0|0xff + gRaspberryPiTokenSpaceGuid.PcdDisplayEnableScaledVModes|L"DisplayEnableScaledVModes"|gConfigDxeFormSetGuid|0x0|0x3f gRaspberryPiTokenSpaceGuid.PcdDisplayEnableSShot|L"DisplayEnableSShot"|gConfigDxeFormSetGuid|0x0|1 # diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc index 2e98c3e16b91..85b5f024ef1b 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.dsc +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc @@ -475,7 +475,7 @@ [PcdsDynamicHii.common.DEFAULT] # # Display-related. # - gRaspberryPiTokenSpaceGuid.PcdDisplayEnableScaledVModes|L"DisplayEnableScaledVModes"|gConfigDxeFormSetGuid|0x0|0xff + gRaspberryPiTokenSpaceGuid.PcdDisplayEnableScaledVModes|L"DisplayEnableScaledVModes"|gConfigDxeFormSetGuid|0x0|0x3f gRaspberryPiTokenSpaceGuid.PcdDisplayEnableSShot|L"DisplayEnableSShot"|gConfigDxeFormSetGuid|0x0|1 # diff --git a/Platform/RaspberryPi/RaspberryPi.dec b/Platform/RaspberryPi/RaspberryPi.dec index 1355cdee0534..10e0ef95a749 100644 --- a/Platform/RaspberryPi/RaspberryPi.dec +++ b/Platform/RaspberryPi/RaspberryPi.dec @@ -56,7 +56,7 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] gRaspberryPiTokenSpaceGuid.PcdDebugEnableJTAG|0|UINT32|0x00000014 gRaspberryPiTokenSpaceGuid.PcdDebugShowUEFIExit|0|UINT32|0x00000015 gRaspberryPiTokenSpaceGuid.PcdCustomCpuClock|0|UINT32|0x00000016 - gRaspberryPiTokenSpaceGuid.PcdDisplayEnableScaledVModes|0|UINT8|0x00000017 + gRaspberryPiTokenSpaceGuid.PcdDisplayEnableScaledVModes|0x3F|UINT8|0x00000017 gRaspberryPiTokenSpaceGuid.PcdDisplayEnableSShot|0|UINT32|0x00000018 gRaspberryPiTokenSpaceGuid.PcdOptDeviceTree|1|UINT32|0x0000001B gRaspberryPiTokenSpaceGuid.PcdRamMoreThan3GB|0|UINT32|0x00000019 -- 2.21.0.windows.1