From 24958f30d944d40aad9bb42776624cc38c35964d Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Wed, 9 Oct 2019 17:53:27 -0700 Subject: [PATCH] x86: move z_x86_early_serial_init() This works with long mode as well, uplevel to common kernel_arch_func.h. Signed-off-by: Andrew Boie --- arch/x86/include/ia32/kernel_arch_func.h | 5 ----- arch/x86/include/kernel_arch_func.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/ia32/kernel_arch_func.h b/arch/x86/include/ia32/kernel_arch_func.h index 34b01f14dc7..112ae277726 100644 --- a/arch/x86/include/ia32/kernel_arch_func.h +++ b/arch/x86/include/ia32/kernel_arch_func.h @@ -23,11 +23,6 @@ extern "C" { #define STACK_ROUND_UP(x) ROUND_UP(x, STACK_ALIGN_SIZE) #define STACK_ROUND_DOWN(x) ROUND_DOWN(x, STACK_ALIGN_SIZE) -#ifdef CONFIG_X86_VERY_EARLY_CONSOLE -/* Setup ultra-minimal serial driver for printk() */ -void z_x86_early_serial_init(void); -#endif - /* Create all page tables with boot configuration and enable paging */ void z_x86_paging_init(void); diff --git a/arch/x86/include/kernel_arch_func.h b/arch/x86/include/kernel_arch_func.h index b425fa97862..93e6a1635c3 100644 --- a/arch/x86/include/kernel_arch_func.h +++ b/arch/x86/include/kernel_arch_func.h @@ -31,6 +31,11 @@ struct multiboot_info; extern FUNC_NORETURN void z_x86_prep_c(int dummy, struct multiboot_info *info); +#ifdef CONFIG_X86_VERY_EARLY_CONSOLE +/* Setup ultra-minimal serial driver for printk() */ +void z_x86_early_serial_init(void); +#endif /* CONFIG_X86_VERY_EARLY_CONSOLE */ + #endif #endif /* ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_FUNC_H_ */