summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Batard <pete@akeo.ie>2020-02-28 10:38:44 +0000
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2020-03-02 12:12:11 +0100
commita409cb000932238d4065bc685805b0bd15566e8e (patch)
treef97b57742712c3684a6364f282dacc2c8ec442d8
parent33fe2a1640f07f3db5ae78ee2a5857bd671978c5 (diff)
Silicon/BcmGenet: Add missing I/O mapping length and clean up
Remove unneeded extra parenthesis on PCD, which can cause problems when used with ACPI ASL macros and add an [Includes] section to the .inf, so that the Genet.h header can be referenced where required. Signed-off-by: Pete Batard <pete@akeo.ie> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-rw-r--r--Silicon/Broadcom/Drivers/Net/BcmGenetDxe/Genet.c2
-rw-r--r--Silicon/Broadcom/Drivers/Net/BcmNet.dec3
-rw-r--r--Silicon/Broadcom/Drivers/Net/Include/Net/Genet.h (renamed from Silicon/Broadcom/Drivers/Net/BcmGenetDxe/Genet.h)3
3 files changed, 6 insertions, 2 deletions
diff --git a/Silicon/Broadcom/Drivers/Net/BcmGenetDxe/Genet.c b/Silicon/Broadcom/Drivers/Net/BcmGenetDxe/Genet.c
index 9f29bc0c..d40ce8b0 100644
--- a/Silicon/Broadcom/Drivers/Net/BcmGenetDxe/Genet.c
+++ b/Silicon/Broadcom/Drivers/Net/BcmGenetDxe/Genet.c
@@ -17,7 +17,7 @@
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiLib.h>
-#include <Genet.h>
+#include <Net/Genet.h>
#include <PiDxe.h>
STATIC
diff --git a/Silicon/Broadcom/Drivers/Net/BcmNet.dec b/Silicon/Broadcom/Drivers/Net/BcmNet.dec
index 2a8688cb..4a55946e 100644
--- a/Silicon/Broadcom/Drivers/Net/BcmNet.dec
+++ b/Silicon/Broadcom/Drivers/Net/BcmNet.dec
@@ -12,6 +12,9 @@
PACKAGE_GUID = 34E19823-D23A-41AB-9C09-ED1225B32DFF
PACKAGE_VERSION = 1.0
+[Includes]
+ Include
+
[Guids]
gBcmNetTokenSpaceGuid = {0x12b97d70, 0x9149, 0x4c2f, {0x82, 0xd5, 0xad, 0xa9, 0x1e, 0x92, 0x75, 0xa1}}
diff --git a/Silicon/Broadcom/Drivers/Net/BcmGenetDxe/Genet.h b/Silicon/Broadcom/Drivers/Net/Include/Net/Genet.h
index 4a3827c0..f56fb297 100644
--- a/Silicon/Broadcom/Drivers/Net/BcmGenetDxe/Genet.h
+++ b/Silicon/Broadcom/Drivers/Net/Include/Net/Genet.h
@@ -11,7 +11,8 @@
#include <Library/PcdLib.h>
-#define GENET_BASE_ADDRESS (FixedPcdGet64 (PcdBcmGenetRegistersAddress))
+#define GENET_BASE_ADDRESS FixedPcdGet64 (PcdBcmGenetRegistersAddress)
+#define GENET_LENGTH 0x00010000
#define GENET_SYS_RBUF_FLUSH_CTRL 0x0008
#define GENET_UMAC_MAC0 0x080c