From patchwork Fri Aug 9 15:03:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 18919 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 505022391D for ; Fri, 9 Aug 2013 15:04:28 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id n1sf5163005qcx.7 for ; Fri, 09 Aug 2013 08:04:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=nvFEIbGhLiiVRo0l9wirlDiJBStlgTyF+c6hbnA9OQc=; b=ovLPfTYjPdkoitGQ+edwXRwIv1Z1QpTTn31aNgndibjEXgthqekTfeKXqzBbAAe8MZ iv9VlcV2rZz6IIBYWETt+c5o6iXYDSLUXHbaVMzq6t1Aahd/QVxROSAj5dgZgj3b254z q/NlwXyDiVCPbnGz9R/wf588mU/YTYBuM2WU6jW2P0ZeMU+JG0P8V+77jr/5rgqQKn9a 5NOUxTyJn3iliCwq+w+rhAgbJS8WPE1+7e0be9Y8AsvDTa+561Be00wt8hIyngtalogS +Ucnm+Q1EE6zsV5bIJzWYtcDxqoBFl/kJZZt47rpBy8yIehWDhgzIyrdCX/C7aqupjhG IkvQ== X-Received: by 10.58.161.195 with SMTP id xu3mr1157524veb.16.1376060667850; Fri, 09 Aug 2013 08:04:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.29.229 with SMTP id n5ls1425896qeh.73.gmail; Fri, 09 Aug 2013 08:04:27 -0700 (PDT) X-Received: by 10.52.170.111 with SMTP id al15mr560050vdc.43.1376060667737; Fri, 09 Aug 2013 08:04:27 -0700 (PDT) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id aj7si4739233vec.21.2013.08.09.08.04.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 08:04:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.45; Received: by mail-vb0-f45.google.com with SMTP id e15so4170863vbg.32 for ; Fri, 09 Aug 2013 08:04:27 -0700 (PDT) X-Gm-Message-State: ALoCoQlSNgAN9X82JoUf3e4KyhT/ubnqY9NEDWJmiGe346tlppTJEeogRlGVj+f2/oarsutvh8+1 X-Received: by 10.220.50.10 with SMTP id x10mr589277vcf.86.1376060667498; Fri, 09 Aug 2013 08:04:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp78345vcz; Fri, 9 Aug 2013 08:04:27 -0700 (PDT) X-Received: by 10.60.93.67 with SMTP id cs3mr797883oeb.12.1376060666838; Fri, 09 Aug 2013 08:04:26 -0700 (PDT) Received: from mail-oa0-f52.google.com (mail-oa0-f52.google.com [209.85.219.52]) by mx.google.com with ESMTPS id fy6si9664483obb.34.2013.08.09.08.04.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 08:04:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.219.52 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.219.52; Received: by mail-oa0-f52.google.com with SMTP id n12so6857128oag.25 for ; Fri, 09 Aug 2013 08:04:26 -0700 (PDT) X-Received: by 10.60.43.73 with SMTP id u9mr855286oel.105.1376060666532; Fri, 09 Aug 2013 08:04:26 -0700 (PDT) Received: from slackpad.drs.calxeda.com (f053081188.adsl.alicedsl.de. [78.53.81.188]) by mx.google.com with ESMTPSA id hm1sm19249781obb.9.2013.08.09.08.04.23 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 08:04:26 -0700 (PDT) From: Andre Przywara To: trini@ti.com, albert.u.boot@aribaud.net, christoffer.dall@linaro.org Cc: u-boot@lists.denx.de, marc.zyngier@arm.com, peter.maydell@linaro.org, geoff.levand@linaro.org, agraf@suse.de, kvmarm@lists.cs.columbia.edu, yamada.m@jp.panasonic.com, nicknickolaev@gmail.com, patches@linaro.org, Andre Przywara Subject: [PATCH v4 1/8] ARM: prepare armv7.h to be included from assembly source Date: Fri, 9 Aug 2013 17:03:05 +0200 Message-Id: <1376060592-10824-2-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1376060592-10824-1-git-send-email-andre.przywara@linaro.org> References: <1376060592-10824-1-git-send-email-andre.przywara@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andre.przywara@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , armv7.h contains some useful constants, but also C prototypes. To include it also in assembly files, protect the non-assembly part appropriately. Signed-off-by: Andre Przywara --- arch/arm/include/asm/armv7.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h index a73630b..20caa7c 100644 --- a/arch/arm/include/asm/armv7.h +++ b/arch/arm/include/asm/armv7.h @@ -23,7 +23,6 @@ */ #ifndef ARMV7_H #define ARMV7_H -#include /* Cortex-A9 revisions */ #define MIDR_CORTEX_A9_R0P1 0x410FC091 @@ -57,6 +56,9 @@ #define ARMV7_CLIDR_CTYPE_INSTRUCTION_DATA 3 #define ARMV7_CLIDR_CTYPE_UNIFIED 4 +#ifndef __ASSEMBLY__ +#include + /* * CP15 Barrier instructions * Please note that we have separate barrier instructions in ARMv7 @@ -74,4 +76,6 @@ void v7_outer_cache_inval_all(void); void v7_outer_cache_flush_range(u32 start, u32 end); void v7_outer_cache_inval_range(u32 start, u32 end); +#endif /* ! __ASSEMBLY__ */ + #endif