[edk2-platforms][PATCH 1/1] Platform/RPi4/ConfigDxe: Replace SD Host with eMMC2 SDHCI option

[edk2-platforms][PATCH 1/1] Platform/RPi4/ConfigDxe: Replace SD Host with eMMC2 SDHCI option

[Pete Batard]

From: Andrei Warkentin <andrey.warkentin@gmail.com>

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>
---
 Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni | 1 +
 Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni
index 046c75f9bfab..26d803f7b68d 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 a440775d5d70..0a650a947b66 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,
-- 
2.21.0.windows.1

Re: [edk2-platforms][PATCH 1/1] Platform/RPi4/ConfigDxe: Replace SD Host with eMMC2 SDHCI option

[Ard Biesheuvel]

On Thu, 26 Mar 2020 at 18:09, Pete Batard <pete@akeo.ie> wrote:
>
> From: Andrei Warkentin <andrey.warkentin@gmail.com>
>
> 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>

Pushed as bba14811b2626663edfea7a51b08ef6f5cba1473

> ---
>  Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni | 1 +
>  Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr | 7 ++++++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni
> index 046c75f9bfab..26d803f7b68d 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 a440775d5d70..0a650a947b66 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,
> --
> 2.21.0.windows.1
>