public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Pete Batard" <pete@akeo.ie>
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	[thread overview]
Message-ID: <20200309142119.7260-3-pete@akeo.ie> (raw)
In-Reply-To: <20200309142119.7260-1-pete@akeo.ie>

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 <pete@akeo.ie>
---
 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


  parent reply	other threads:[~2020-03-09 14:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-09 14:21 [edk2-devel][PATCH 0/2] Platform/RPi: Fix compilation warnings Pete Batard
2020-03-09 14:21 ` [edk2-devel][PATCH 1/2] Platform/RPi/AcpiTables: Fix ASL " Pete Batard
2020-03-09 14:21 ` Pete Batard [this message]
2020-03-25  9:37 ` [edk2-devel][PATCH 0/2] Platform/RPi: Fix " 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=20200309142119.7260-3-pete@akeo.ie \
    --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