From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web10.6498.1573747686221006402 for ; Thu, 14 Nov 2019 08:08:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=EIBSI1Rf; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.66, mailfrom: pete@akeo.ie) Received: by mail-wr1-f66.google.com with SMTP id s5so7125796wrw.2 for ; Thu, 14 Nov 2019 08:08:05 -0800 (PST) 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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jl9ygHWfFgKIYXQSI+a0RJD1dA0VZy/lCWTAO9BnACw=; b=EIBSI1RfFNtBB9zh3oP8yfu1lvY3yiXZK/mWqT+p5j7meCLaOG3mUc7tWiI5krEbLn Ch56oSf/ctnnV90VytJemWlRTyC+FTt91AGeqYVt0Ptys9geB+5ug6HnOubkn3YRMzmT aB8SN05xtbczMBv9nBNRZqLK1Ay7Kl587c7H+Sfn8bMn4ZdJKYzBTUmTL1xS4p8l/E5S 5afexP0uGTe4sZWB1MyhcA28pLnJy/XTbryyBIDn06l+Xfd6UBOaNGuwC3uI2hJLDFE+ 7JUEIsJjFGKRQGDFE1JosF3i7NF8Lvg0IoKvO2YERSLGPtF/ct+CitK7D6BCSBCCRPxP 2muQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jl9ygHWfFgKIYXQSI+a0RJD1dA0VZy/lCWTAO9BnACw=; b=OT6z9UzIet/E90hfqIqaAcEYcn0Dv0mM3SxXadUUctqN/ZcQzJu38WWuoq8g3Elj37 k0mGfaPveaCsAcv7fuio7Rr4trNfhX7C4nCpEzeB0F1p+5Fzsm2M+hMmA54Qc6Lh6Xda XkvND0MEd2+EKrpoHjKJCiZTKLsnNfT7JZXTq+vaPfQUZ8ZfWBmHBXVrPqfxB4dxXaLf xknWqnMmkIvOkhb3UzQU4NKEfVTU+TwOfoZJs9WcAfj2N7qK9/2EYjIDy6GNXue2IrER Brv2FMpoz8PHPKqO4NfcDEqPCCHl4/nYvi57Ypr+ImJprZT/rjBLL64F68/FiCQRca0j 4xlw== X-Gm-Message-State: APjAAAX+Qky9M8Qczg/ax1bWC3VIFFXo154G2br5Ke2rby+dv9FheVRF b5s0NKIpiKCzQAGgy9hp3kEaVYBawBw= X-Google-Smtp-Source: APXvYqxaQMTtPEvkA+zJPZr7BGqvywnUbk2y2Pc77xTFybaY+oW4Y1o8egjdWlSfgQF2fVWvB03nyA== X-Received: by 2002:adf:c786:: with SMTP id l6mr8483113wrg.45.1573747684513; Thu, 14 Nov 2019 08:08:04 -0800 (PST) Return-Path: Received: from localhost.localdomain ([84.203.67.47]) by smtp.gmail.com with ESMTPSA id a16sm6793088wmd.11.2019.11.14.08.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 08:08:04 -0800 (PST) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, philmd@redhat.com Subject: [edk2-platforms][PATCH 7/8] Platform/RPi: Replace MMCHS1BASE define with a PCD Date: Thu, 14 Nov 2019 16:07:39 +0000 Message-Id: <20191114160740.10072-8-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20191114160740.10072-1-pete@akeo.ie> References: <20191114160740.10072-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Samer El-Haj-Mahmoud Replace MMCHS1BASE with PcdMmcHs1BaseAddress. This is needed in preparation for adding Raspberry Pi 4 support Signed-off-by: Pete Batard --- Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf | 1 + Platform/RaspberryPi/RPi3/RPi3.dsc | 1 + Silicon/Broadcom/Bcm283x/Bcm283x.dec | 1 + Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf index 034c8c449f00..0d7c57152107 100644 --- a/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf +++ b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf @@ -44,6 +44,7 @@ [Protocols] [Pcd] gRaspberryPiTokenSpaceGuid.PcdSdIsArasan gBcm283xTokenSpaceGuid.PcdBcm283xRegistersAddress + gBcm283xTokenSpaceGuid.PcdMmcHs1BaseAddress [Depex] gRaspberryPiFirmwareProtocolGuid AND gRaspberryPiConfigAppliedProtocolGuid diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 88af37e6edaa..059549068e02 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -378,6 +378,7 @@ [PcdsFixedAtBuild.common] gBcm283xTokenSpaceGuid.PcdBcm283xRegistersAddress|0x3f000000 gBcm283xTokenSpaceGuid.PcdMboxBaseAddress|0x3f00b880 gBcm283xTokenSpaceGuid.PcdWdogBaseAddress|0x3f100000 + gBcm283xTokenSpaceGuid.PcdMmcHs1BaseAddress|0x3f300000 ## NS16550 compatible UART gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3f215040 diff --git a/Silicon/Broadcom/Bcm283x/Bcm283x.dec b/Silicon/Broadcom/Bcm283x/Bcm283x.dec index fe1907cb8cf1..5053077e6448 100644 --- a/Silicon/Broadcom/Bcm283x/Bcm283x.dec +++ b/Silicon/Broadcom/Bcm283x/Bcm283x.dec @@ -23,3 +23,4 @@ [PcdsFixedAtBuild.common] gBcm283xTokenSpaceGuid.PcdBcm283xRegistersAddress|0x0|UINT32|0x00000001 gBcm283xTokenSpaceGuid.PcdMboxBaseAddress|0x0|UINT32|0x00000002 gBcm283xTokenSpaceGuid.PcdWdogBaseAddress|0x0|UINT32|0x00000003 + gBcm283xTokenSpaceGuid.PcdMmcHs1BaseAddress|0x0|UINT32|0x00000004 diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h index fb0d02904156..ac2581d4cb64 100644 --- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h +++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h @@ -1,5 +1,6 @@ /** @file * + * Copyright (c) 2019, ARM Limited. All rights reserved. * Copyright (c) Microsoft Corporation. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent @@ -10,7 +11,7 @@ #define __BCM2836_SDIO_H__ //MMC/SD/SDIO1 register definitions. -#define MMCHS1BASE 0x3F300000 +#define MMCHS1BASE (FixedPcdGet64 (PcdMmcHs1BaseAddress)) #define MMCHS_BLK (MMCHS1BASE + 0x4) #define BLEN_512BYTES (0x200UL << 0) -- 2.21.0.windows.1