From patchwork Tue Jul 9 23:54:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 18293 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0644725E49 for ; Tue, 9 Jul 2013 23:55:18 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 13sf6050312lba.9 for ; Tue, 09 Jul 2013 16:55:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=nvFEIbGhLiiVRo0l9wirlDiJBStlgTyF+c6hbnA9OQc=; b=My3WemBI/uLRIYIcrJc3scdvcuoqWVap6Aux2Nj1sPKl+RZmXG5tzpKrMv3r8DhCqR i5uMGVWBET236i4hd4NXJV2F2CF39116/gbJrt5X7vDsVU4IsELUSaHwc2qLQPPpypb7 mXgwGVG0mmGJbLjLT/mAK3ECDHgQee8zU7guMebn9k2Ii3+uxZzn9WjQrecOLnUsvHR0 bmiKPweYEc2pwQ7d1b4J6+l8QwBEbyeX6hcS8GRmzOAlOiFe6TuiY5Al2eTU4b+8ULyc 13ou7L2HTt8GYmX1qItA43m/GCj391WdKbCxcGtWYrI8KmE5SshjMwxV0ve12y5wRxKD z+tg== X-Received: by 10.180.185.132 with SMTP id fc4mr8326924wic.7.1373414117104; Tue, 09 Jul 2013 16:55:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.10.133 with SMTP id i5ls1404580wib.20.gmail; Tue, 09 Jul 2013 16:55:16 -0700 (PDT) X-Received: by 10.180.211.171 with SMTP id nd11mr15599478wic.17.1373414116896; Tue, 09 Jul 2013 16:55:16 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id z5si9385670wiw.16.2013.07.09.16.55.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Jul 2013 16:55:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id d10so5168949vea.38 for ; Tue, 09 Jul 2013 16:55:15 -0700 (PDT) X-Received: by 10.220.67.204 with SMTP id s12mr16782vci.8.1373414115816; Tue, 09 Jul 2013 16:55:15 -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.149.77 with SMTP id s13csp57402vcv; Tue, 9 Jul 2013 16:55:15 -0700 (PDT) X-Received: by 10.180.80.166 with SMTP id s6mr6411899wix.38.1373414114337; Tue, 09 Jul 2013 16:55:14 -0700 (PDT) Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by mx.google.com with ESMTPS id li6si9388263wjb.47.2013.07.09.16.55.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Jul 2013 16:55:14 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.182 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.212.182; Received: by mail-wi0-f182.google.com with SMTP id m6so5716768wiv.3 for ; Tue, 09 Jul 2013 16:55:13 -0700 (PDT) X-Received: by 10.194.90.244 with SMTP id bz20mr16965493wjb.69.1373414113886; Tue, 09 Jul 2013 16:55:13 -0700 (PDT) Received: from localhost.localdomain ([193.120.41.118]) by mx.google.com with ESMTPSA id fs8sm64073738wib.0.2013.07.09.16.55.12 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Jul 2013 16:55:13 -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 Subject: [PATCH v3 1/7] ARM: prepare armv7.h to be included from assembly source Date: Wed, 10 Jul 2013 01:54:13 +0200 Message-Id: <1373414059-22779-2-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1373414059-22779-1-git-send-email-andre.przywara@linaro.org> References: <1373414059-22779-1-git-send-email-andre.przywara@linaro.org> X-Gm-Message-State: ALoCoQnYvtgFvHSSKqjYA/xYEzHFFemf3CbzDslvhdamHPhZu7HEocLDCZuKZcKIopFtO+25V0Qv X-Original-Sender: andre.przywara@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 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