From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.groups.io with SMTP id smtpd.web11.51876.1585580010377091654 for ; Mon, 30 Mar 2020 07:53:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=H920ta41; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f66.google.com with SMTP id i19so1921583wmb.0 for ; Mon, 30 Mar 2020 07:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Gxh4tPmqwtfhbcSOUJx/Pn7EYMgfawpsvEuhm3R2d4w=; b=H920ta414+WfMzxisvx4vUTYdlNneH10pghkCrk8Ggg482tt4sMTA+OQXnhmavRRCz G9R93IMjNOMdVw2c2suSfQTbTdtQrwfscyAoh0E2jG5b7kgQXNPU5mYsEi2ogFsOh6OR eDtyjoT9dRWNumS4r1KPjjHpJU6h595DBueYpJG6AdveuvAnBxAqGIZIq0/UTvepKCXX J3x3uOLHIiuhDq3EBbgWv1pE5PoP+/h4PxdPot1MStAX09rniuOwsr72dfQYFXDnsA3c JQZHXocUGlXGNmnbZ9mgRBUYkYHmoh8A0dDrs4MN3uii3MRMhUVCTgGNsibrJZi2kl21 DGTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Gxh4tPmqwtfhbcSOUJx/Pn7EYMgfawpsvEuhm3R2d4w=; b=HEOWllOPPXksrr1MSEFT4F06DvD3E+9X5ejvmqdJyub8aatbeYQ0gjioLGvuhh2JzB BSoKIQ8sKY80gs9iA9bJFYAeON2fAzxB+XaCwaMdkHMdWuEy0jceepwKKuuOKhDwgcGG JM+MH2KTXz9M6/+CxdngVdRLEY28j9vlEKH6Eb/PGMmj3tyt1Ed2oN6HQ7XgcpSJE406 VITafMKdQR+UhjNtJtpteQ4///o1CJ1/NFUf0b7OlPr9J/wObbQWmh498dkC48hxeBmc CKVNi1cJn4akSS1RW4/FVBZkA38nMK5SN4L37PUXUKtTzcCZFJYdz/GAXHxyTuuWi4XJ 9Arw== X-Gm-Message-State: ANhLgQ3b63FyQ55zHrGs3cy0gqgpj4nQUNXXiZ0nRPcAH6LKTIpV/DLQ HjdNPeSISLX7WqSOQocO2y04Nv0oXMoDMLPU9re+yA== X-Google-Smtp-Source: ADFU+vuJP0qEwipCM9ciafXYneYAW+1dSnv8zo4Ek5HfKTsTpIspVqNkupgSF9P/urevpKZf36v3kXbY/MIrR3CW2z8= X-Received: by 2002:a7b:cb81:: with SMTP id m1mr13389168wmi.1.1585580008962; Mon, 30 Mar 2020 07:53:28 -0700 (PDT) MIME-Version: 1.0 References: <20200326170913.10264-1-pete@akeo.ie> In-Reply-To: <20200326170913.10264-1-pete@akeo.ie> From: "Ard Biesheuvel" Date: Mon, 30 Mar 2020 16:53:18 +0200 Message-ID: Subject: Re: [edk2-platforms][PATCH 1/1] Platform/RPi4/ConfigDxe: Replace SD Host with eMMC2 SDHCI option To: Pete Batard Cc: edk2-devel-groups-io , Leif Lindholm , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Andrei Warkentin Content-Type: text/plain; charset="UTF-8" On Thu, 26 Mar 2020 at 18:09, Pete Batard wrote: > > 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 Reviewed-by: Ard Biesheuvel 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 >