From patchwork Thu Mar 13 15:09:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26208 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 50D17206A0 for ; Thu, 13 Mar 2014 15:12:29 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id oy12sf2587850veb.11 for ; Thu, 13 Mar 2014 08:12:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=rtG4j3WtPxoaeBLHl/oNZizrXuXQ54/KrVm8LPRrHSY=; b=j30jBZHA9hzZWmtUHoOZemtmV989YWP+j5v+9mYc/AyNcpc6z3+PMyV5OeA4ooCMEI 8uEHseVXyK6EUQMkbRNlSwBUeGC+fOKu5O+wERp4BcHp3puOAarkmIlIpAUl4b2y9K3r 0/UZ1vaPWiLYqkCaI49aHKTSLD8vqFe+GWOoEQT3woLel2zNUmQhCLJvYxz0CqOfCJO2 MqFNQSe1kf+qqB1qLMJxkMfiSVtt6ntC8ltc5bKkIOeiPuoSID5Gnu7C0TF8owq+Ybwr u5UvnL6+W+/IVeHd0xIs5uZ8zjHyTkeSQ4I8whVQSaJylv2Zav6mQ5cdYl/+0soORBjI d8tg== X-Gm-Message-State: ALoCoQkWE84B5fVC9iGmnp9EEK55X62pp5TZl+RGaA9UrPxb2CTPC3iZMAl8erVATwiTspmnalPP X-Received: by 10.58.59.104 with SMTP id y8mr838158veq.18.1394723548912; Thu, 13 Mar 2014 08:12:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.85 with SMTP id a79ls291196qge.72.gmail; Thu, 13 Mar 2014 08:12:28 -0700 (PDT) X-Received: by 10.58.18.231 with SMTP id z7mr550879ved.40.1394723548784; Thu, 13 Mar 2014 08:12:28 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id rx10si527893vdc.110.2014.03.13.08.12.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 08:12:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so1267296vcb.29 for ; Thu, 13 Mar 2014 08:12:28 -0700 (PDT) X-Received: by 10.220.95.139 with SMTP id d11mr1922284vcn.21.1394723548656; Thu, 13 Mar 2014 08:12:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp374693vck; Thu, 13 Mar 2014 08:12:28 -0700 (PDT) X-Received: by 10.58.229.4 with SMTP id sm4mr1991230vec.10.1394723548045; Thu, 13 Mar 2014 08:12:28 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id e9si893057vcf.124.2014.03.13.08.12.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 13 Mar 2014 08:12:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WO7GK-0001WK-P9; Thu, 13 Mar 2014 15:09:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WO7GJ-0001VV-GU for xen-devel@lists.xenproject.org; Thu, 13 Mar 2014 15:09:35 +0000 Received: from [85.158.139.211:52756] by server-7.bemta-5.messagelabs.com id A5/F3-20531-E2AC1235; Thu, 13 Mar 2014 15:09:34 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-16.tower-206.messagelabs.com!1394723372!851062!1 X-Originating-IP: [74.125.82.171] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6975 invoked from network); 13 Mar 2014 15:09:33 -0000 Received: from mail-we0-f171.google.com (HELO mail-we0-f171.google.com) (74.125.82.171) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Mar 2014 15:09:33 -0000 Received: by mail-we0-f171.google.com with SMTP id t61so981717wes.30 for ; Thu, 13 Mar 2014 08:09:32 -0700 (PDT) X-Received: by 10.194.190.10 with SMTP id gm10mr2134005wjc.55.1394723372251; Thu, 13 Mar 2014 08:09:32 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id d15sm6358675wjx.0.2014.03.13.08.09.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Mar 2014 08:09:31 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 13 Mar 2014 15:09:16 +0000 Message-Id: <1394723358-22845-4-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394723358-22845-1-git-send-email-julien.grall@linaro.org> References: <1394723358-22845-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v4 3/5] xen/arm: Rename EARLY_PRINTK compile option to CONFIG_EARLY_PRINTK X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Most of common compile option start with CONFIG_. Rename EARLY_PRINTK option to CONFIG_EARLY_PRINTK to be compliant. This option will be used in common code (eg console) later. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/Rules.mk | 2 +- xen/arch/arm/arm32/head.S | 18 +++++++++--------- xen/arch/arm/arm64/head.S | 18 +++++++++--------- xen/include/asm-arm/early_printk.h | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index aa2e79f..c551afb 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -93,7 +93,7 @@ ifneq ($(EARLY_PRINTK_INC),) EARLY_PRINTK := y endif -CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK +CFLAGS-$(EARLY_PRINTK) += -DCONFIG_EARLY_PRINTK CFLAGS-$(EARLY_PRINTK_INIT_UART) += -DEARLY_PRINTK_INIT_UART CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK_INC=\"debug-$(EARLY_PRINTK_INC).inc\" CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK_BAUD=$(EARLY_PRINTK_BAUD) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 0110807..a36ea52 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -34,7 +34,7 @@ #define PT_UPPER(x) (PT_##x & 0xf00) #define PT_LOWER(x) (PT_##x & 0x0ff) -#if (defined (EARLY_PRINTK)) && (defined (EARLY_PRINTK_INC)) +#if (defined (CONFIG_EARLY_PRINTK)) && (defined (EARLY_PRINTK_INC)) #include EARLY_PRINTK_INC #endif @@ -59,7 +59,7 @@ */ /* Macro to print a string to the UART, if there is one. * Clobbers r0-r3. */ -#ifdef EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK #define PRINT(_s) \ adr r0, 98f ; \ bl puts ; \ @@ -67,9 +67,9 @@ 98: .asciz _s ; \ .align 2 ; \ 99: -#else /* EARLY_PRINTK */ +#else /* CONFIG_EARLY_PRINTK */ #define PRINT(s) -#endif /* !EARLY_PRINTK */ +#endif /* !CONFIG_EARLY_PRINTK */ .arm @@ -149,7 +149,7 @@ common_start: b 2b 1: -#ifdef EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK ldr r11, =EARLY_UART_BASE_ADDRESS /* r11 := UART base address */ teq r12, #0 /* Boot CPU sets up the UART too */ bleq init_uart @@ -330,7 +330,7 @@ paging: /* Now we can install the fixmap and dtb mappings, since we * don't need the 1:1 map any more */ dsb -#if defined(EARLY_PRINTK) /* Fixmap is only used by early printk */ +#if defined(CONFIG_EARLY_PRINTK) /* Fixmap is only used by early printk */ /* Non-boot CPUs don't need to rebuild the fixmap itself, just * the mapping from boot_second to xen_fixmap */ teq r12, #0 @@ -492,7 +492,7 @@ ENTRY(relocate_xen) mov pc, lr -#ifdef EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK /* Bring up the UART. * r11: Early UART base address * Clobbers r0-r2 */ @@ -537,7 +537,7 @@ putn: hex: .ascii "0123456789abcdef" .align 2 -#else /* EARLY_PRINTK */ +#else /* CONFIG_EARLY_PRINTK */ init_uart: .global early_puts @@ -545,7 +545,7 @@ early_puts: puts: putn: mov pc, lr -#endif /* !EARLY_PRINTK */ +#endif /* !CONFIG_EARLY_PRINTK */ /* * Local variables: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 6f80db2..7e612e9 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -30,7 +30,7 @@ #define PT_DEV 0xe71 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=0 P=1 */ #define PT_DEV_L3 0xe73 /* nG=1 AF=1 SH=10 AP=01 NS=1 ATTR=100 T=1 P=1 */ -#if (defined (EARLY_PRINTK)) && (defined (EARLY_PRINTK_INC)) +#if (defined (CONFIG_EARLY_PRINTK)) && (defined (EARLY_PRINTK_INC)) #include EARLY_PRINTK_INC #endif @@ -71,7 +71,7 @@ /* Macro to print a string to the UART, if there is one. * Clobbers x0-x3. */ -#ifdef EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK #define PRINT(_s) \ adr x0, 98f ; \ bl puts ; \ @@ -79,9 +79,9 @@ 98: .asciz _s ; \ .align 2 ; \ 99: -#else /* EARLY_PRINTK */ +#else /* CONFIG_EARLY_PRINTK */ #define PRINT(s) -#endif /* !EARLY_PRINTK */ +#endif /* !CONFIG_EARLY_PRINTK */ /*.aarch64*/ @@ -174,7 +174,7 @@ common_start: b 2b 1: -#ifdef EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK ldr x23, =EARLY_UART_BASE_ADDRESS /* x23 := UART base address */ cbnz x22, 1f bl init_uart /* Boot CPU sets up the UART too */ @@ -343,7 +343,7 @@ paging: /* Now we can install the fixmap and dtb mappings, since we * don't need the 1:1 map any more */ dsb sy -#if defined(EARLY_PRINTK) /* Fixmap is only used by early printk */ +#if defined(CONFIG_EARLY_PRINTK) /* Fixmap is only used by early printk */ /* Non-boot CPUs don't need to rebuild the fixmap itself, just * the mapping from boot_second to xen_fixmap */ cbnz x22, 1f @@ -489,7 +489,7 @@ ENTRY(relocate_xen) ret -#ifdef EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK /* Bring up the UART. * x23: Early UART base address * Clobbers x0-x1 */ @@ -536,7 +536,7 @@ putn: hex: .ascii "0123456789abcdef" .align 2 -#else /* EARLY_PRINTK */ +#else /* CONFIG_EARLY_PRINTK */ init_uart: .global early_puts @@ -544,7 +544,7 @@ early_puts: puts: putn: ret -#endif /* EARLY_PRINTK */ +#endif /* !CONFIG_EARLY_PRINTK */ /* * Local variables: diff --git a/xen/include/asm-arm/early_printk.h b/xen/include/asm-arm/early_printk.h index 100ae23..5ef2ec4 100644 --- a/xen/include/asm-arm/early_printk.h +++ b/xen/include/asm-arm/early_printk.h @@ -12,7 +12,7 @@ #include -#ifdef EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK /* need to add the uart address offset in page to the fixmap address */ #define EARLY_UART_VIRTUAL_ADDRESS \ @@ -22,7 +22,7 @@ #ifndef __ASSEMBLY__ -#ifdef EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK void early_puts(const char *s); void early_printk(const char *fmt, ...) @@ -42,7 +42,7 @@ static inline void noreturn __attribute__((format (printf, 1, 2))) early_panic(const char *fmt, ...) {while(1);} -#endif +#endif /* !CONFIG_EARLY_PRINTK */ #endif /* __ASSEMBLY__ */