diff options
| author | Andrei Warkentin <andrey.warkentin@gmail.com> | 2020-03-26 17:09:13 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2020-03-30 16:52:06 +0200 |
| commit | bba14811b2626663edfea7a51b08ef6f5cba1473 (patch) | |
| tree | 710fb93d0d4318b62b15c87ccc2a09bd84d16b95 /Platform | |
| parent | cdd63d10d5efaeec1cd5fa5f11a8353e4de832d7 (diff) | |
Platform/RPi4/ConfigDxe: Replace SD Host with eMMC2 SDHCI option
SD Host is not usable on Pi 4 so replace it with an eMMC2 option.
Note that is a menu only change at this stage, since we don't have
eMMC support finalized.
Signed-off-by: Pete Batard <pete@akeo.ie>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'Platform')
| -rw-r--r-- | Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni | 1 | ||||
| -rw-r--r-- | Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni index 046c75f9..26d803f7 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni @@ -55,6 +55,7 @@ #string STR_MMC_SD_PROMPT #language en-US "uSD Routing"
#string STR_MMC_SD_HELP #language en-US "Choose host controller to drive uSD slot"
+#string STR_MMC_SD_EMMC2 #language en-US "eMMC2 SDHCI"
#string STR_MMC_SD_SDHOST #language en-US "Broadcom SDHOST"
#string STR_MMC_SD_ARASAN #language en-US "Arasan SDHCI"
diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr index a440775d..0a650a94 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr @@ -87,7 +87,7 @@ typedef struct { typedef struct {
/*
- * 0 - uSD slot routed to Broadcom SDHOST.
+ * 0 - uSD slot routed to Broadcom SDHOST on Pi 3 or eMMC2 on Pi 4.
* 1 - uSD slot routed to Arasan SDHCI.
*/
UINT32 Routing;
@@ -302,8 +302,13 @@ formset prompt = STRING_TOKEN(STR_MMC_SD_PROMPT),
help = STRING_TOKEN(STR_MMC_SD_HELP),
flags = NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED,
+#if (RPI_MODEL == 4)
+ option text = STRING_TOKEN(STR_MMC_SD_ARASAN), value = 1, flags = DEFAULT;
+ option text = STRING_TOKEN(STR_MMC_SD_EMMC2), value = 0, flags = 0;
+#else
option text = STRING_TOKEN(STR_MMC_SD_ARASAN), value = 1, flags = 0;
option text = STRING_TOKEN(STR_MMC_SD_SDHOST), value = 0, flags = DEFAULT;
+#endif
endoneof;
oneof varid = MmcDisableMulti.DisableMulti,
|