From: Julien Grall <julien.grall@linaro.org>
To: xen-devel@lists.xenproject.org
Cc: stefano.stabellini@citrix.com,
Julien Grall <julien.grall@linaro.org>,
tim@xen.org, ian.campbell@citrix.com
Subject: [PATCH v4 3/5] xen/arm: Rename EARLY_PRINTK compile option to CONFIG_EARLY_PRINTK
Date: Thu, 13 Mar 2014 15:09:16 +0000 [thread overview]
Message-ID: <1394723358-22845-4-git-send-email-julien.grall@linaro.org> (raw)
In-Reply-To: <1394723358-22845-1-git-send-email-julien.grall@linaro.org>
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 <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
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 <xen/config.h>
-#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__ */
--
1.7.10.4
next prev parent reply other threads:[~2014-03-13 15:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-13 15:09 [PATCH v4 0/5] xen/arm: Merge early_printk function in console code Julien Grall
2014-03-13 15:09 ` [PATCH v4 1/5] xen/arm: earlyprintk: move early_flush in early_puts Julien Grall
2014-03-13 15:09 ` [PATCH v4 2/5] xen/arm: earlyprintk: export early_puts Julien Grall
2014-03-13 15:09 ` Julien Grall [this message]
2014-03-13 15:09 ` [PATCH v4 4/5] xen/console: Add support for early printk Julien Grall
2014-03-28 15:29 ` Keir Fraser
2014-03-13 15:09 ` [PATCH v4 5/5] xen/arm: Replace early_{printk, panic} call to {printk, panic} call Julien Grall
2014-04-01 10:54 ` [PATCH v4 0/5] xen/arm: Merge early_printk function in console code Ian Campbell
2014-04-01 11:07 ` Julien Grall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394723358-22845-4-git-send-email-julien.grall@linaro.org \
--to=julien.grall@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=stefano.stabellini@citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).