Omap35xxPkg, BeagleBoardPkg: Use Pcd for INTERRUPT_BASE

The base address for the interrupt controller is hard-coded in
Omap3530Interrupt.h, although Omap35xxPkg/InterruptDxe appears to
have initially intended to make use of PcdInterruptBaseAddress from
EmbeddedPkg. Move it to use said Pcd, and also declare use of it in
BeagleBoardLib, which makes a direct access.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index b074b92005d104ab05f5f1de553ede398977f9be..69d3c5f1841b7578cf50ca3cf32a94a9930ba085 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -3,6 +3,7 @@
 #\r
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\r
 # Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -359,6 +360,9 @@
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds|77\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|13000000\r
 \r
+  # OMAP Interrupt Controller\r
+  gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000\r
+\r
   # We want to use the Shell Libraries but don't want it to initialise\r
   # automatically. We initialise the libraries when the command is called by the\r
   # Shell.\r

diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
index b1139a477d081919ac228c899a3d55f39353e22c..e004d6f10b9a2859dd98e5b6b402706be7f3a02c 100644 (file)
--- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
+++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf
@@ -1,5 +1,6 @@
 #/* @file\r
 #  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2016, Linaro Ltd. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -52,3 +53,5 @@
 \r
   gArmTokenSpaceGuid.PcdSystemMemoryBase\r
   gArmTokenSpaceGuid.PcdSystemMemorySize\r
+\r
+  gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress\r

diff --git a/Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h b/Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h
index 774d8730153da9dfb4ee82333cd84c83795b421d..d8d727e4c86dbf5511a977b65c97e6f788bffa06 100644 (file)
--- a/Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h
+++ b/Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h
@@ -1,6 +1,7 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -15,7 +16,9 @@
 #ifndef __OMAP3530INTERRUPT_H__\r
 #define __OMAP3530INTERRUPT_H__\r
 \r
-#define INTERRUPT_BASE (0x48200000)\r
+#include <Library/PcdLib.h>\r
+\r
+#define INTERRUPT_BASE        (PcdGet32 (PcdInterruptBaseAddress))\r
 \r
 #define INT_NROF_VECTORS      (96)\r
 #define MAX_VECTOR            (INT_NROF_VECTORS - 1)\r

diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index 4a3317f255f6acd7b344d2c2846db8e330a853aa..436c10bb7f2fc44e20b7118429e1d9b15ccf8d8e 100644 (file)
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -2,6 +2,7 @@
 # Omap35xx SoC package.\r
 #\r
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\r
+# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -159,6 +160,9 @@
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds|77\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|13000000\r
 \r
+  # OMAP Interrupt Controller\r
+  gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000\r
+\r
   #\r
   # ARM Pcds\r
   #\r