@@ -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)
@@ -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:
@@ -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:
@@ -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__ */