From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by mx.groups.io with SMTP id smtpd.web10.375.1585242566730400522 for ; Thu, 26 Mar 2020 10:09:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=Mr4e2wB5; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.208.65, mailfrom: pete@akeo.ie) Received: by mail-ed1-f65.google.com with SMTP id a43so7723722edf.6 for ; Thu, 26 Mar 2020 10:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6FJCwRaRwzoMchJurk+XGYocprVTVbDsXftyCucPqO8=; b=Mr4e2wB5iqT80tkRtrv3K+Cp6WqTfDo46hILbCNoqrn7vXf5d8xSZWxzdQxgC7P/uc 2angymwssBWBtZpIkQPYJj6AOQpYBSEubcielDeeH+FKvlJaalq0a+o3Gqp1kJd+PDWB wWsKkD5ZMFDKXfEyiRhKlNIi5FmEsmREXIYTMPiibEaaVKdfzbAzM05OJlenp5haficG DXGEiO/fJQ6K6ho3H5N7zxMMujAscPC5f2suZWnoneNXSSK+C8j4E89Nwz3xckIbG/ZP qIDc1alM6zUfHF3QOV/TyPjrcXjg6YOD5EU8wIgzkK2h944wJOO3CAtJFRLZ88Fy6kGq s2Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6FJCwRaRwzoMchJurk+XGYocprVTVbDsXftyCucPqO8=; b=d/uBOhItz9EnpNRgIJNON0u9853eReG6VJwlOsAdluukV8ZspYqraXyb5ImFu1Q2HQ 5Sbs+LXbrdNeAhSNQE7G05oqYfA5LW/Iy7RDw9RNTXgeEU/YgHeOT/PinZkUeFAebRup mN9mz72p9GC5FdDwroMTf9X8Pmgz+UzZwvRMcIp9RKlZSFKDfFuGBUjrcs2UAyMEeGJR aRE1fYL8krJ/fcyV1g0oAikvJf1OmAmQdlQQlwFdYOC2hTaIKS6jEuk9doRwohEkivxU Ek70PXyMLpT3QD+tuXsUoZgPACvD6rOh7LXLdDy2pwQuIZkYRfDCPMGNcpevD9RD3E+x 8NaA== X-Gm-Message-State: ANhLgQ02xyZaX3XdKSBoEYqyC8zZI9y3YlBIabYCP179p7Gp/gLFXjpi ytdOZ01Z2z+LvGv5/enWNAXnQGuQa93Iag== X-Google-Smtp-Source: ADFU+vv7yEeZ1awOoIC3K3VuWXABB+0YTke3hY08OqqEJoQwG28c50RrSKjz8Pw0wi68MCdHDtrRZw== X-Received: by 2002:a17:906:c9c1:: with SMTP id hk1mr9091178ejb.146.1585242564801; Thu, 26 Mar 2020 10:09:24 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.78.33]) by smtp.gmail.com with ESMTPSA id da23sm419550edb.85.2020.03.26.10.09.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 10:09:24 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif@nuviainc.com, philmd@redhat.com, awarkentin@vmware.com Subject: [edk2-platforms][PATCH 1/1] Platform/RPi4/ConfigDxe: Replace SD Host with eMMC2 SDHCI option Date: Thu, 26 Mar 2020 17:09:13 +0000 Message-Id: <20200326170913.10264-1-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Andrei Warkentin 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 --- 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