Reviewed-by: Andrei Warkentin ________________________________ From: Jeremy Linton Sent: Monday, February 1, 2021 4:53 PM To: devel@edk2.groups.io Cc: pete@akeo.ie ; Andrei Warkentin ; samer.el-haj-mahmoud@arm.com ; leif@nuviainc.com ; ardb+tianocore@kernel.org ; Jeremy Linton Subject: [PATCH v2 4/4] Platform/RaspberryPi: Invert default Arasan, Emmc2 routing In order for the wifi to work, and the SD to run at full speed we need to bind the sd slot to the eMMC2 controller. Since we now have a driver for the eMMC2 controller there isn't any reason to leave the SD card bound to the older Arasan controller. Signed-off-by: Jeremy Linton --- Platform/RaspberryPi/RPi4/RPi4.dsc | 2 +- Platform/RaspberryPi/RPi4/Readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc index 9962df0076..e0fad6f744 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.dsc +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc @@ -475,7 +475,7 @@ # SD-related. # - gRaspberryPiTokenSpaceGuid.PcdSdIsArasan|L"SdIsArasan"|gConfigDxeFormSetGuid|0x0|1 + gRaspberryPiTokenSpaceGuid.PcdSdIsArasan|L"SdIsArasan"|gConfigDxeFormSetGuid|0x0|0 gRaspberryPiTokenSpaceGuid.PcdMmcForce1Bit|L"MmcForce1Bit"|gConfigDxeFormSetGuid|0x0|0 gRaspberryPiTokenSpaceGuid.PcdMmcForceDefaultSpeed|L"MmcForceDefaultSpeed"|gConfigDxeFormSetGuid|0x0|0 gRaspberryPiTokenSpaceGuid.PcdMmcSdDefaultSpeedMHz|L"MmcSdDefaultSpeedMHz"|gConfigDxeFormSetGuid|0x0|25 diff --git a/Platform/RaspberryPi/RPi4/Readme.md b/Platform/RaspberryPi/RPi4/Readme.md index 3b2ed44e3c..80899f4ca4 100644 --- a/Platform/RaspberryPi/RPi4/Readme.md +++ b/Platform/RaspberryPi/RPi4/Readme.md @@ -181,7 +181,7 @@ Limit RAM to 3 GB | `RamLimitTo3GB` | Disable = `0x00000000`
Ena System Table Selection | `SystemTableMode`| ACPI = `0x00000000` (default)
ACPI + Devicetree = `0x00000001`
Devicetree = `0x00000002` Asset Tag | `AssetTag` | String, 32 characters or less (e.g. `L"ABCD123"`)
(default `L""`) **SD/MMC Configuration** | -uSD/eMMC Routing | `SdIsArasan` | Arasan SDHC = `0x00000001` (default)
eMMC2 SDHCI = `0x00000000` +uSD/eMMC Routing | `SdIsArasan` | Arasan SDHC = `0x00000001`
eMMC2 SDHCI = `0x00000000` (default) Multi-Block Support | `MmcDisableMulti` | Multi-block transfers = `0x00000000` (default)
Single block transfers = `0x00000001` uSD Max Bus Width | `MmcForce1Bit` | 4-bit Mode = `0x00000000` (default)
1-bit Mode = `0x00000001` uSD Force Default Speed | `MmcForceDefaultSpeed` | Allow High Speed = `0x00000000` (default)
Force Default Speed = `0x00000001` -- 2.13.7