From patchwork Thu Sep 19 16:06:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 20453 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 777BA23906 for ; Thu, 19 Sep 2013 16:08:26 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id cm18sf6168607qab.4 for ; Thu, 19 Sep 2013 09:08:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version: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=6M64+8JcvL0lI1ov8tp+Z0JneIj30dSvgqHYUboXMQY=; b=JAuBTWfaq8Qp3KsfuWfLeog7bw45rP8vY0EHLb8p2wQzcrzW9qUjYNY7i7y3B/OIuy yjzfDCokpIZpgJ+glh7bzLUzDApu6VUP7T6gOxc+ybiPS3YcDfIJgBJn/p7+lUD8bfRx 0WUKJ+WaT+5XHQnsoF9dJqf4r+fT2fvXmDvQW1aNY8vSHCPEFhdZjUwR0ZdfG66D4djF KePAqO6p0LBsjVS1j2Wv55S2T3/9LuNpo6FucwccFg25L+AviiiRXe73+BBOr+xombbh XMJCzCgch7gTFWmSTN9ZhLU9EaQKHp5sjyICbcqAQpGE4mTsYD+vQBtRfnY5+5pGdWVV RIfA== X-Gm-Message-State: ALoCoQnDT38tFmI24R6uyJZFZMXPaeZvjMPvMH86ogR0QBpZCZvmug8yIrIIaPoEHZgqOQJXNUyG X-Received: by 10.236.110.168 with SMTP id u28mr919147yhg.40.1379606906088; Thu, 19 Sep 2013 09:08:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.121.104 with SMTP id lj8ls4065058qeb.11.gmail; Thu, 19 Sep 2013 09:08:26 -0700 (PDT) X-Received: by 10.221.40.10 with SMTP id to10mr1851270vcb.22.1379606905991; Thu, 19 Sep 2013 09:08:25 -0700 (PDT) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by mx.google.com with ESMTPS id sc5si1965031vdc.74.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Sep 2013 09:08:25 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.47 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.47; Received: by mail-vb0-f47.google.com with SMTP id h10so6411862vbh.20 for ; Thu, 19 Sep 2013 09:08:25 -0700 (PDT) X-Received: by 10.58.133.66 with SMTP id pa2mr1858465veb.18.1379606905919; Thu, 19 Sep 2013 09:08:25 -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 u4csp286289vcz; Thu, 19 Sep 2013 09:08:25 -0700 (PDT) X-Received: by 10.182.80.196 with SMTP id t4mr1792592obx.1.1379606905305; Thu, 19 Sep 2013 09:08:25 -0700 (PDT) Received: from mail-ob0-f179.google.com (mail-ob0-f179.google.com [209.85.214.179]) by mx.google.com with ESMTPS id f9si3602275obv.23.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Sep 2013 09:08:25 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.179 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.214.179; Received: by mail-ob0-f179.google.com with SMTP id wn1so9837069obc.38 for ; Thu, 19 Sep 2013 09:08:25 -0700 (PDT) X-Received: by 10.60.45.65 with SMTP id k1mr1447500oem.48.1379606904845; Thu, 19 Sep 2013 09:08:24 -0700 (PDT) Received: from slackpad.drs.calxeda.com (f053081156.adsl.alicedsl.de. [78.53.81.156]) by mx.google.com with ESMTPSA id s9sm4867327obu.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Sep 2013 09:08:24 -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, agraf@suse.de, geoff.levand@linaro.org, kvmarm@lists.cs.columbia.edu, Masahiro Yamada , Nikolay Nikolaev , patches@linaro.org, Andre Przywara Subject: [PATCH v5 1/8] ARM: prepare armv7.h to be included from assembly source Date: Thu, 19 Sep 2013 18:06:39 +0200 Message-Id: <1379606806-439-2-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1379606806-439-1-git-send-email-andre.przywara@linaro.org> References: <1379606806-439-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.47 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(-) Changes: v3..v4: none v4..v5: none diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h index 392d6a2..0f7cbbf 100644 --- a/arch/arm/include/asm/armv7.h +++ b/arch/arm/include/asm/armv7.h @@ -7,7 +7,6 @@ */ #ifndef ARMV7_H #define ARMV7_H -#include /* Cortex-A9 revisions */ #define MIDR_CORTEX_A9_R0P1 0x410FC091 @@ -41,6 +40,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 @@ -58,4 +60,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