From patchwork Sun Nov 27 23:26:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 84346 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp914907qgi; Sun, 27 Nov 2016 15:26:12 -0800 (PST) X-Received: by 10.84.218.13 with SMTP id q13mr43060013pli.168.1480289172336; Sun, 27 Nov 2016 15:26:12 -0800 (PST) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id d14si52926640pfj.6.2016.11.27.15.26.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Nov 2016 15:26:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CC63781D72; Sun, 27 Nov 2016 15:26:11 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com [IPv6:2a00:1450:400c:c09::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2D8E481CC1 for ; Sun, 27 Nov 2016 15:26:10 -0800 (PST) Received: by mail-wm0-x22b.google.com with SMTP id f82so139330706wmf.1 for ; Sun, 27 Nov 2016 15:26:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=03jvqWE2d8ggRDt12h9SDknQJ2P3zi7QlI0vlLgXins=; b=g+5RlWi50ZjSJ+WrWrvdAMeGPQZ6xxDGnmXVi5H3Ta3tSQBafBZpM8QBl95jPerJd8 EI/Ojel+c1Dcr5b4NxJUBaRU1YCa9og3vrGWeTrurpT3vs7LtUxuXmS05IBUTcNZJg1Q XMQSsrSGAfwCsJJlfZPuGSutXVhy1cto5rHMo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=03jvqWE2d8ggRDt12h9SDknQJ2P3zi7QlI0vlLgXins=; b=kAz7jF5Tsd7ew6lmv/ZwQLriwPD9+6OXHuuuX/PewZZ4fxjDugK8xmEnfa9AKRbwg8 VRd/FV5UFgXUy7Zo3ELnZkvVFXES7l/RRx3eU5+mqM+1LnBG7/MnAS9X7JQlefb+BH2r eDKEN/ZGDHItlMwsVUJtUu5smQvgAxWapbjY44YR6vfY4wtYSek3bmJG5i1ehys/YST3 1o4dPBnXTl5OWpYz/6Sn/LH/yO04SXy6iKJqcsTLR3Bg5/Mbe8r4Is5NRvE2hzUoSJT0 3UopXRtarsN6Y+SEOy/6ny+c2AUH+GmwrkhFiM/LAY8agTx77FI6pRNGga90mnn9Aw7i fHow== X-Gm-Message-State: AKaTC01FZ/MaG6pUcqXmrUMPeDp4y91NAQlOag8+1vG+3VojU3E+SFHPDeM3GYHz1e+ExWA+ X-Received: by 10.28.182.4 with SMTP id g4mr17711997wmf.15.1480289168423; Sun, 27 Nov 2016 15:26:08 -0800 (PST) Received: from mohikan.hemma.eciton.net ([2a01:348:6:8735:e23f:49ff:fe6d:9d26]) by smtp.gmail.com with ESMTPSA id ba10sm59327509wjb.32.2016.11.27.15.26.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Nov 2016 15:26:07 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Sun, 27 Nov 2016 23:26:06 +0000 Message-Id: <20161127232606.21364-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.10.2 Subject: [edk2] [PATCH] Omap35xxPkg, BeagleBoardPkg: Use Pcd for INTERRUPT_BASE X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Fish , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 --- Linux uses the same driver for OMAP2/OMAP3 and the AM3xxx variants, so this tweak should make it possible to reuse across different platforms. BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++++ BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf | 3 +++ Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h | 5 ++++- Omap35xxPkg/Omap35xxPkg.dsc | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) -- 2.10.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc index f40095a..9b4142f 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -3,6 +3,7 @@ # # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.
# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2016, Linaro Ltd. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -359,6 +360,9 @@ gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds|77 gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|13000000 + # OMAP Interrupt Controller + gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000 + # We want to use the Shell Libraries but don't want it to initialise # automatically. We initialise the libraries when the command is called by the # Shell. diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf index b1139a4..e004d6f 100644 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoardLib.inf @@ -1,5 +1,6 @@ #/* @file # Copyright (c) 2011-2013, ARM Limited. All rights reserved. +# Copyright (c) 2016, Linaro Ltd. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -52,3 +53,5 @@ gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize + + gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress diff --git a/Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h b/Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h index 774d873..d8d727e 100644 --- a/Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h +++ b/Omap35xxPkg/Include/Omap3530/Omap3530Interrupt.h @@ -1,6 +1,7 @@ /** @file Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
+ Copyright (c) 2016, Linaro Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -15,7 +16,9 @@ #ifndef __OMAP3530INTERRUPT_H__ #define __OMAP3530INTERRUPT_H__ -#define INTERRUPT_BASE (0x48200000) +#include + +#define INTERRUPT_BASE (PcdGet32 (PcdInterruptBaseAddress)) #define INT_NROF_VECTORS (96) #define MAX_VECTOR (INT_NROF_VECTORS - 1) diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc index 4a3317f..436c10b 100644 --- a/Omap35xxPkg/Omap35xxPkg.dsc +++ b/Omap35xxPkg/Omap35xxPkg.dsc @@ -2,6 +2,7 @@ # Omap35xx SoC package. # # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.
+# Copyright (c) 2016, Linaro Ltd. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -159,6 +160,9 @@ gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds|77 gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|13000000 + # OMAP Interrupt Controller + gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000 + # # ARM Pcds #