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 <p...@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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55691): https://edk2.groups.io/g/devel/message/55691
Mute This Topic: https://groups.io/mt/71835504/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
