From: Samer El-Haj-Mahmoud <sa...@elhajmahmoud.com> Replace DW2_USB_BASE_ADDRESS with PcdDw2UsbBaseAddress. This is needed in preparation for adding Raspberry Pi 4 support.
Signed-off-by: Pete Batard <p...@akeo.ie> --- Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf | 1 + Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h | 4 ++-- Platform/RaspberryPi/RPi3/RPi3.dsc | 1 + Platform/RaspberryPi/RaspberryPi.dec | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf index 8817f20622d6..dc50f955f2fb 100644 --- a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf +++ b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf @@ -54,6 +54,7 @@ [Protocols] [FixedPcd] gBcm283xTokenSpaceGuid.PcdBcm283xRegistersAddress + gRaspberryPiTokenSpaceGuid.PcdDw2UsbBaseAddress [Depex] gRaspberryPiFirmwareProtocolGuid diff --git a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h index 88fd93934fd3..17daef60f967 100644 --- a/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h +++ b/Platform/RaspberryPi/Drivers/DwUsbHostDxe/DwcHw.h @@ -1,5 +1,6 @@ /** @file * + * Copyright (c) 2019, ARM Limited. All rights reserved. * Copyright (c) 2017, Andrey Warkentin <andrey.warken...@gmail.com> * Copyright (c) 2015-2016, Linaro Limited. All rights reserved. * @@ -10,8 +11,7 @@ #ifndef __DWCHW_H__ #define __DWCHW_H__ -#define DW2_USB_BASE_ADDRESS 0x3f980000 - +#define DW2_USB_BASE_ADDRESS (FixedPcdGet64 (PcdDw2UsbBaseAddress)) #define HSOTG_REG(x) (x) #define HCCHAR(_ch) HSOTG_REG(0x0500 + 0x20 * (_ch)) diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 059549068e02..d7450d857bd5 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -379,6 +379,7 @@ [PcdsFixedAtBuild.common] gBcm283xTokenSpaceGuid.PcdMboxBaseAddress|0x3f00b880 gBcm283xTokenSpaceGuid.PcdWdogBaseAddress|0x3f100000 gBcm283xTokenSpaceGuid.PcdMmcHs1BaseAddress|0x3f300000 + gRaspberryPiTokenSpaceGuid.PcdDw2UsbBaseAddress|0x3f980000 ## NS16550 compatible UART gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x3f215040 diff --git a/Platform/RaspberryPi/RaspberryPi.dec b/Platform/RaspberryPi/RaspberryPi.dec index c7e17350544a..aa0c6e826866 100644 --- a/Platform/RaspberryPi/RaspberryPi.dec +++ b/Platform/RaspberryPi/RaspberryPi.dec @@ -43,6 +43,7 @@ [PcdsFixedAtBuild.common] gRaspberryPiTokenSpaceGuid.PcdNvStorageFtwSpareBase|0x0|UINT32|0x00000006 gRaspberryPiTokenSpaceGuid.PcdNvStorageFtwWorkingBase|0x0|UINT32|0x00000007 gRaspberryPiTokenSpaceGuid.PcdExtendedMemoryBase|0x0|UINT32|0x00000008 + gRaspberryPiTokenSpaceGuid.PcdDw2UsbBaseAddress|0x0|UINT32|0x00000009 [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] gRaspberryPiTokenSpaceGuid.PcdCpuClock|0|UINT32|0x0000000d -- 2.21.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#50697): https://edk2.groups.io/g/devel/message/50697 Mute This Topic: https://groups.io/mt/57792705/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-