From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.755.1588267024602998260 for ; Thu, 30 Apr 2020 10:17:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ard.biesheuvel@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 34C0E101E; Thu, 30 Apr 2020 10:17:04 -0700 (PDT) Received: from e123331-lin.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3428A3F73D; Thu, 30 Apr 2020 10:17:02 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif@nuviainc.com, Ard Biesheuvel Subject: [PATCH edk2-platforms v3 5/8] Platform/HiKey: switch to relocated version of eMMC driver Date: Thu, 30 Apr 2020 19:16:46 +0200 Message-Id: <20200430171650.24139-6-ard.biesheuvel@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200430171650.24139-1-ard.biesheuvel@arm.com> References: <20200430171650.24139-1-ard.biesheuvel@arm.com> Switch to the version of the DesignWare eMMC host controller driver that was moved into edk2-platforms, as part of a spring cleaning exercise of EmbeddedPkg. Signed-off-by: Ard Biesheuvel --- Platform/Hisilicon/HiKey/HiKey.dsc | 7 ++++--- Platform/Hisilicon/HiKey/HiKey.fdf | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc index bcbe4fafce1a..600f19a30762 100644 --- a/Platform/Hisilicon/HiKey/HiKey.dsc +++ b/Platform/Hisilicon/HiKey/HiKey.dsc @@ -131,8 +131,9 @@ [PcdsFixedAtBuild.common] # # DW MMC/SD card controller # - gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress|0xF723D000 - gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeClockFrequencyInHz|100000000 + gDesignWareTokenSpaceGuid.PcdDwEmmcDxeBaseAddress|0xF723D000 + gDesignWareTokenSpaceGuid.PcdDwEmmcDxeClockFrequencyInHz|100000000 + gDesignWareTokenSpaceGuid.PcdDwPermitObsoleteDrivers|TRUE # # @@ -216,7 +217,7 @@ [Components.common] # MMC/SD # EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf + Silicon/Synopsys/DesignWare/Drivers/DwEmmcDxe/DwEmmcDxe.inf # # USB Host Support diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf index 33fa0da208fb..657e6c8ef2ec 100644 --- a/Platform/Hisilicon/HiKey/HiKey.fdf +++ b/Platform/Hisilicon/HiKey/HiKey.fdf @@ -128,7 +128,7 @@ [FV.FvMain] # Multimedia Card Interface # INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - INF EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf + INF Silicon/Synopsys/DesignWare/Drivers/DwEmmcDxe/DwEmmcDxe.inf # # USB Host Support -- 2.17.1