From cd98159a6eff94489bbceed205801c480fcaa8f6 Mon Sep 17 00:00:00 2001 From: Jared McNeill Date: Sat, 25 May 2024 08:12:20 -0300 Subject: [PATCH] fixup! Rk356x: Add option to disable EFI_MEMORY_ATTRIBUTE_PROTOCOL. --- .../Platform/Firefly/ROC-RK3566-PC/ROC-RK3566-PC.dsc | 2 +- .../Platform/Firefly/ROC-RK3568-PC/ROC-RK3568-PC.dsc | 2 +- edk2-rockchip/Platform/OrangePi/OrangePi3B/OrangePi3B.dsc | 2 +- edk2-rockchip/Platform/Pine64/PineTab2/PineTab2.dsc | 2 +- edk2-rockchip/Platform/Pine64/Quartz64/Quartz64.dsc | 2 +- edk2-rockchip/Platform/Pine64/SOQuartz/SOQuartz.dsc | 2 +- .../Rockchip/Rk356x/Drivers/ConfigDxe/ConfigDxeHii.uni | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3566-PC/ROC-RK3566-PC.dsc b/edk2-rockchip/Platform/Firefly/ROC-RK3566-PC/ROC-RK3566-PC.dsc index 7ae68c950..392d6a740 100644 --- a/edk2-rockchip/Platform/Firefly/ROC-RK3566-PC/ROC-RK3566-PC.dsc +++ b/edk2-rockchip/Platform/Firefly/ROC-RK3566-PC/ROC-RK3566-PC.dsc @@ -497,7 +497,7 @@ gRk356xTokenSpaceGuid.PcdSystemTableMode|L"SystemTableMode"|gConfigDxeFormSetGuid|0x0|0 gRk356xTokenSpaceGuid.PcdCpuClock|L"CpuClock"|gConfigDxeFormSetGuid|0x0|2 gRk356xTokenSpaceGuid.PcdCustomCpuClock|L"CustomCpuClock"|gConfigDxeFormSetGuid|0x0|816 - gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|1 + gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|0x0|1 # # Common UEFI ones. diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3568-PC/ROC-RK3568-PC.dsc b/edk2-rockchip/Platform/Firefly/ROC-RK3568-PC/ROC-RK3568-PC.dsc index 64bee8af6..80351f722 100644 --- a/edk2-rockchip/Platform/Firefly/ROC-RK3568-PC/ROC-RK3568-PC.dsc +++ b/edk2-rockchip/Platform/Firefly/ROC-RK3568-PC/ROC-RK3568-PC.dsc @@ -517,7 +517,7 @@ gRk356xTokenSpaceGuid.PcdSystemTableMode|L"SystemTableMode"|gConfigDxeFormSetGuid|0x0|0 gRk356xTokenSpaceGuid.PcdCpuClock|L"CpuClock"|gConfigDxeFormSetGuid|0x0|2 gRk356xTokenSpaceGuid.PcdCustomCpuClock|L"CustomCpuClock"|gConfigDxeFormSetGuid|0x0|816 - gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|1 + gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|0x0|1 # # Common UEFI ones. diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi3B/OrangePi3B.dsc b/edk2-rockchip/Platform/OrangePi/OrangePi3B/OrangePi3B.dsc index 9f046eace..aca5b4bfc 100644 --- a/edk2-rockchip/Platform/OrangePi/OrangePi3B/OrangePi3B.dsc +++ b/edk2-rockchip/Platform/OrangePi/OrangePi3B/OrangePi3B.dsc @@ -504,7 +504,7 @@ gRk356xTokenSpaceGuid.PcdSystemTableMode|L"SystemTableMode"|gConfigDxeFormSetGuid|0x0|0 gRk356xTokenSpaceGuid.PcdCpuClock|L"CpuClock"|gConfigDxeFormSetGuid|0x0|2 gRk356xTokenSpaceGuid.PcdCustomCpuClock|L"CustomCpuClock"|gConfigDxeFormSetGuid|0x0|816 - gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|1 + gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|0x0|1 # # Common UEFI ones. diff --git a/edk2-rockchip/Platform/Pine64/PineTab2/PineTab2.dsc b/edk2-rockchip/Platform/Pine64/PineTab2/PineTab2.dsc index f719e2b80..1ad773519 100644 --- a/edk2-rockchip/Platform/Pine64/PineTab2/PineTab2.dsc +++ b/edk2-rockchip/Platform/Pine64/PineTab2/PineTab2.dsc @@ -487,7 +487,7 @@ gRk356xTokenSpaceGuid.PcdCpuClock|L"CpuClock"|gConfigDxeFormSetGuid|0x0|2 gRk356xTokenSpaceGuid.PcdCustomCpuClock|L"CustomCpuClock"|gConfigDxeFormSetGuid|0x0|816 gRk356xTokenSpaceGuid.PcdMultiPhy1Mode|L"MultiPhy1Mode"|gConfigDxeFormSetGuid|0x0|0 - gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|1 + gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|0x0|1 # # Common UEFI ones. diff --git a/edk2-rockchip/Platform/Pine64/Quartz64/Quartz64.dsc b/edk2-rockchip/Platform/Pine64/Quartz64/Quartz64.dsc index 2da533ddf..68cb4e6a5 100644 --- a/edk2-rockchip/Platform/Pine64/Quartz64/Quartz64.dsc +++ b/edk2-rockchip/Platform/Pine64/Quartz64/Quartz64.dsc @@ -502,7 +502,7 @@ gRk356xTokenSpaceGuid.PcdCustomCpuClock|L"CustomCpuClock"|gConfigDxeFormSetGuid|0x0|816 gRk356xTokenSpaceGuid.PcdMultiPhy1Mode|L"MultiPhy1Mode"|gConfigDxeFormSetGuid|0x0|0 gRk356xTokenSpaceGuid.PcdFanMode|L"FanMode"|gConfigDxeFormSetGuid|0x0|1 - gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|1 + gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|0x0|1 # # Common UEFI ones. diff --git a/edk2-rockchip/Platform/Pine64/SOQuartz/SOQuartz.dsc b/edk2-rockchip/Platform/Pine64/SOQuartz/SOQuartz.dsc index f005a11c6..9138f923b 100644 --- a/edk2-rockchip/Platform/Pine64/SOQuartz/SOQuartz.dsc +++ b/edk2-rockchip/Platform/Pine64/SOQuartz/SOQuartz.dsc @@ -483,7 +483,7 @@ gRk356xTokenSpaceGuid.PcdSystemTableMode|L"SystemTableMode"|gConfigDxeFormSetGuid|0x0|0 gRk356xTokenSpaceGuid.PcdCpuClock|L"CpuClock"|gConfigDxeFormSetGuid|0x0|2 gRk356xTokenSpaceGuid.PcdCustomCpuClock|L"CustomCpuClock"|gConfigDxeFormSetGuid|0x0|816 - gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|1 + gRk356xTokenSpaceGuid.PcdMemAttrProtocolEnable|L"MemAttrProtocolEnable"|gConfigDxeFormSetGuid|0x0|1 # # Common UEFI ones. diff --git a/edk2-rockchip/Platform/Rockchip/Rk356x/Drivers/ConfigDxe/ConfigDxeHii.uni b/edk2-rockchip/Platform/Rockchip/Rk356x/Drivers/ConfigDxe/ConfigDxeHii.uni index ac617c124..b4c36ce76 100755 --- a/edk2-rockchip/Platform/Rockchip/Rk356x/Drivers/ConfigDxe/ConfigDxeHii.uni +++ b/edk2-rockchip/Platform/Rockchip/Rk356x/Drivers/ConfigDxe/ConfigDxeHii.uni @@ -21,8 +21,8 @@ #string STR_SYSCONFIG_SYSTAB_BOTH #language en-US "ACPI + Devicetree" #string STR_SYSCONFIG_SYSTAB_DT #language en-US "Devicetree" -#string STR_SYSCONFIG_MEMATTR_PROMPT #language en-US "EFI_MEMORY_ATTRIBUTE_PROTOCOL Support" -#string STR_SYSCONFIG_MEMATTR_HELP #language en-US "Disable EFI_MEMORY_ATTRIBUTE_PROTOCOL support to work around buggy Linux distributions." +#string STR_SYSCONFIG_MEMATTR_PROMPT #language en-US "Memory Protection Support" +#string STR_SYSCONFIG_MEMATTR_HELP #language en-US "Enable support for UEFI memory attribute protocol." #string STR_SYSCONFIG_CPUCLOCK_PROMPT #language en-US "CPU Clock" #string STR_SYSCONFIG_CPUCLOCK_HELP #language en-US "CPU Speed"