EDK2/edk2-rk3588
1
0
Fork 0
mirror of https://github.com/edk2-porting/edk2-rk3588.git synced 2025-12-19 03:54:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes after EDK2 update

Browse Source 
Signed-off-by: Mario Bălănică <mariobalanica02@gmail.com>
This commit is contained in:
Mario Bălănică
2025-12-07 11:13:45 +02:00
parent 4dc1930d05
commit 630ebc9181
8 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
edk2-rockchip/Silicon/Rockchip/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
View File

@@ -272,14 +272,13 @@ CHAR8 *mEnclosureInfoType3Strings[] = {
SMBIOS data definition TYPE4 Processor Information SMBIOS data definition TYPE4 Processor Information
************************************************************************/ ************************************************************************/
SMBIOS_TABLE_TYPE4 mProcessorInfoType4 = { SMBIOS_TABLE_TYPE4 mProcessorInfoType4 = {
{ EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE4), 0 }, { EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE4), 0 },
1, // Socket String 1, // Socket String
CentralProcessor, // ProcessorType; ///< The enumeration value from PROCESSOR_TYPE_DATA. CentralProcessor, // ProcessorType; ///< The enumeration value from PROCESSOR_TYPE_DATA.
ProcessorFamilyIndicatorFamily2, // ProcessorFamily; ///< The enumeration value from PROCESSOR_FAMILY2_DATA. ProcessorFamilyIndicatorFamily2, // ProcessorFamily; ///< The enumeration value from PROCESSOR_FAMILY2_DATA.
2, // ProcessorManufacture String; 2, // ProcessorManufacture String;
{ // ProcessorId; { // ProcessorId;
{ 0x00, 0x00, 0x00, 0x00}, 0x00, 0x00, 0x00, 0x00
{ 0x00, 0x00, 0x00, 0x00}
}, },
3, // ProcessorVersion String; 3, // ProcessorVersion String;
{ // Voltage; { // Voltage;
@@ -344,8 +343,8 @@ SMBIOS_TABLE_TYPE7 mCacheInfoType7_L1I = {
// Enabled/Disabled :1 (Enabled) // Enabled/Disabled :1 (Enabled)
// Operational Mode :2 (Unknown) // Operational Mode :2 (Unknown)
// Reserved :6 // Reserved :6
0x0020, // Maximum Size (32KB) { 0x0020, 0 }, // Maximum Size (32KB)
0x0020, // Install Size (32KB) { 0x0020, 0 }, // Install Size (32KB)
{ // Supported SRAM Type { // Supported SRAM Type
0, // Other :1 0, // Other :1
0, // Unknown :1 0, // Unknown :1
@@ -387,8 +386,8 @@ SMBIOS_TABLE_TYPE7 mCacheInfoType7_L1D = {
// Enabled/Disabled :1 (Enabled) // Enabled/Disabled :1 (Enabled)
// Operational Mode :2 (WB) // Operational Mode :2 (WB)
// Reserved :6 // Reserved :6
0x0020, // Maximum Size (32KB) { 0x0020, 0 }, // Maximum Size (32KB)
0x0020, // Install Size (32KB) { 0x0020, 0 }, // Install Size (32KB)
{ // Supported SRAM Type { // Supported SRAM Type
0, // Other :1 0, // Other :1
0, // Unknown :1 0, // Unknown :1
@@ -430,8 +429,8 @@ SMBIOS_TABLE_TYPE7 mCacheInfoType7_L2 = {
// Enabled/Disabled :1 (Enabled) // Enabled/Disabled :1 (Enabled)
// Operational Mode :2 (WB) // Operational Mode :2 (WB)
// Reserved :6 // Reserved :6
0x0200, // Maximum Size (512KB) { 0x0200, 0 }, // Maximum Size (512KB)
0x0200, // Install Size (512KB) { 0x0200, 0 }, // Install Size (512KB)
{ // Supported SRAM Type { // Supported SRAM Type
0, // Other :1 0, // Other :1
0, // Unknown :1 0, // Unknown :1

1
edk2-rockchip/Silicon/Rockchip/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf
View File

@@ -20,6 +20,7 @@
[Packages] [Packages]
EmbeddedPkg/EmbeddedPkg.dec EmbeddedPkg/EmbeddedPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
Silicon/Rockchip/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec Silicon/Rockchip/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec

3
edk2-rockchip/Silicon/Rockchip/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
View File

@@ -53,9 +53,6 @@
UefiLib UefiLib
UefiRuntimeServicesTableLib UefiRuntimeServicesTableLib
[FeaturePcd]
gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
[FixedPcd] [FixedPcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString

1
edk2-rockchip/Silicon/Rockchip/RK3588/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
View File

@@ -24,6 +24,7 @@
ArmPkg/ArmPkg.dec ArmPkg/ArmPkg.dec
ArmPlatformPkg/ArmPlatformPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec
Silicon/Rockchip/RK3588/RK3588.dec Silicon/Rockchip/RK3588/RK3588.dec
UefiCpuPkg/UefiCpuPkg.dec
[LibraryClasses] [LibraryClasses]
DebugLib DebugLib

2
edk2-rockchip/Silicon/Rockchip/RK3588/Library/PlatformLib/PlatformLib.inf
View File

@@ -26,11 +26,11 @@
ArmPlatformPkg/ArmPlatformPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec
Silicon/Rockchip/RK3588/RK3588.dec Silicon/Rockchip/RK3588/RK3588.dec
Silicon/Rockchip/RockchipPkg.dec Silicon/Rockchip/RockchipPkg.dec
UefiCpuPkg/UefiCpuPkg.dec
[LibraryClasses] [LibraryClasses]
ArmLib ArmLib
BaseVariableLib BaseVariableLib
FdtLib
IoLib IoLib
MemoryAllocationLib MemoryAllocationLib
PcdLib PcdLib

17
edk2-rockchip/Silicon/Rockchip/Rockchip.dsc.inc
View File

@@ -137,11 +137,6 @@
# SCMI Mailbox Transport Layer # SCMI Mailbox Transport Layer
ArmMtlLib|Silicon/Rockchip/Library/RkMtlLib/RkMtlLib.inf ArmMtlLib|Silicon/Rockchip/Library/RkMtlLib/RkMtlLib.inf
# SMC/HVC dependencies
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
ArmHvcLib|ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf
ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
# #
# Secure Boot dependencies # Secure Boot dependencies
# #
@@ -178,9 +173,11 @@
CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf ArmSmcLib|MdePkg/Library/ArmSmcLib/ArmSmcLib.inf
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
ArmMmuLib|UefiCpuPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
ArmTransferListLib|ArmPkg/Library/ArmTransferListLib/ArmTransferListLib.inf
TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
# UART libraries # UART libraries
@@ -206,7 +203,7 @@
SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
# Flattened Device Tree (FDT) access library # Flattened Device Tree (FDT) access library
FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
@@ -294,10 +291,8 @@
PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
## Fixed compile error after upgrade to 14.10
PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
[LibraryClasses.common.DXE_CORE] [LibraryClasses.common.DXE_CORE]
@@ -444,7 +439,6 @@ FspiLib|Silicon/Rockchip/Library/FspiLib/FspiLib.inf
# Set timer interrupt to be triggerred in 1ms to avoid missing # Set timer interrupt to be triggerred in 1ms to avoid missing
# serial terminal input characters. # serial terminal input characters.
gEmbeddedTokenSpaceGuid.PcdTimerPeriod|10000 gEmbeddedTokenSpaceGuid.PcdTimerPeriod|10000
gArmTokenSpaceGuid.PcdVFPEnabled|1
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32
# #
@@ -488,6 +482,7 @@ FspiLib|Silicon/Rockchip/Library/FspiLib/FspiLib.inf
ArmPlatformPkg/PeilessSec/PeilessSec.inf { ArmPlatformPkg/PeilessSec/PeilessSec.inf {
<LibraryClasses> <LibraryClasses>
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
PeilessSecMeasureLib|SecurityPkg/Library/PeilessSecMeasureLib/PeilessSecMeasureLibNull.inf
} }
# #

1
edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHcDxe.h
View File

@@ -18,7 +18,6 @@
#include <Protocol/ComponentName.h> #include <Protocol/ComponentName.h>
#include <Protocol/ComponentName2.h> #include <Protocol/ComponentName2.h>
#include <Protocol/DeviceIo.h>
#include <Protocol/DriverBinding.h> #include <Protocol/DriverBinding.h>
#include <Protocol/SdMmcPassThru.h> #include <Protocol/SdMmcPassThru.h>

16
edk2-rockchip/Silicon/Synopsys/DesignWare/Drivers/DwMmcHcDxe/DwMmcHci.c
View File

@@ -991,11 +991,11 @@ DwMmcCreateTrb (
IN EFI_EVENT Event IN EFI_EVENT Event
) )
{ {
DW_MMC_HC_TRB *Trb; DW_MMC_HC_TRB *Trb;
EFI_STATUS Status; EFI_STATUS Status;
EFI_TPL OldTpl; EFI_TPL OldTpl;
EFI_IO_OPERATION_TYPE Flag; DMA_MAP_OPERATION MapOperation;
UINTN MapLength; UINTN MapLength;
Trb = AllocateZeroPool (sizeof (DW_MMC_HC_TRB)); Trb = AllocateZeroPool (sizeof (DW_MMC_HC_TRB));
if (Trb == NULL) { if (Trb == NULL) {
@@ -1035,9 +1035,9 @@ DwMmcCreateTrb (
Trb->Mode = SdMmcPioMode; Trb->Mode = SdMmcPioMode;
} else { } else {
if (Trb->Read) { if (Trb->Read) {
Flag = EfiBusMasterWrite; MapOperation = MapOperationBusMasterWrite;
} else { } else {
Flag = EfiBusMasterRead; MapOperation = MapOperationBusMasterRead;
} }
if (Private->Slot[Trb->Slot].CardType == SdCardType) { if (Private->Slot[Trb->Slot].CardType == SdCardType) {
@@ -1046,7 +1046,7 @@ DwMmcCreateTrb (
Trb->UseFifo = FALSE; Trb->UseFifo = FALSE;
if (Trb->DataLen) { if (Trb->DataLen) {
MapLength = Trb->DataLen; MapLength = Trb->DataLen;
Status = DmaMap (Flag, Trb->Data, &MapLength, &Trb->DataPhy, &Trb->DataMap); Status = DmaMap (MapOperation, Trb->Data, &MapLength, &Trb->DataPhy, &Trb->DataMap);
/* Status = DevIo->Map ( /* Status = DevIo->Map (
DevIo, DevIo,