diff --git a/arch/arc/platforms/generic_arc/system.c b/arch/arc/platforms/generic_arc/system.c index 537d52d2262..98ea5f864cb 100644 --- a/arch/arc/platforms/generic_arc/system.c +++ b/arch/arc/platforms/generic_arc/system.c @@ -66,4 +66,4 @@ static int generic_arc_init(struct device *arg) return 0; } DECLARE_DEVICE_INIT_CONFIG(generic_arc_0, "", generic_arc_init, NULL); -pure_core_init(generic_arc_0, NULL); +pre_kernel_core_init(generic_arc_0, NULL); diff --git a/arch/arm/platforms/fsl_frdm_k64f/system.c b/arch/arm/platforms/fsl_frdm_k64f/system.c index 5edba8cabd1..40b41783549 100644 --- a/arch/arm/platforms/fsl_frdm_k64f/system.c +++ b/arch/arm/platforms/fsl_frdm_k64f/system.c @@ -323,4 +323,4 @@ static int fsl_frdm_k64f_init(struct device *arg) } DECLARE_DEVICE_INIT_CONFIG(fsl_frdm_0, "", fsl_frdm_k64f_init, NULL); -pure_core_init(fsl_frdm_0, NULL); +pre_kernel_core_init(fsl_frdm_0, NULL); diff --git a/arch/arm/platforms/ti_lm3s6965/system.c b/arch/arm/platforms/ti_lm3s6965/system.c index 463ef4f11df..80ce9244d3a 100644 --- a/arch/arm/platforms/ti_lm3s6965/system.c +++ b/arch/arm/platforms/ti_lm3s6965/system.c @@ -71,4 +71,4 @@ static int ti_lm3s6965_init(struct device *arg) } DECLARE_DEVICE_INIT_CONFIG(ti_lm3_0, "", ti_lm3s6965_init, NULL); -pure_core_init(ti_lm3_0, NULL); +pre_kernel_core_init(ti_lm3_0, NULL); diff --git a/arch/x86/platforms/galileo/galileo.c b/arch/x86/platforms/galileo/galileo.c index 18b39e26e22..6acdfc17aac 100644 --- a/arch/x86/platforms/galileo/galileo.c +++ b/arch/x86/platforms/galileo/galileo.c @@ -149,26 +149,26 @@ static int hpet_irq_set(struct device *unused) } DECLARE_DEVICE_INIT_CONFIG(hpetirq, "", hpet_irq_set, NULL); -pure_core_init(hpetirq, NULL); +pre_kernel_core_init(hpetirq, NULL); #endif /* CONFIG_HPET_TIMER */ #ifdef CONFIG_IOAPIC DECLARE_DEVICE_INIT_CONFIG(ioapic_0, "", _ioapic_init, NULL); -pure_core_init(ioapic_0, NULL); +pre_kernel_core_init(ioapic_0, NULL); #endif /* CONFIG_IOAPIC */ #ifdef CONFIG_LOAPIC DECLARE_DEVICE_INIT_CONFIG(loapic_0, "", _loapic_init, NULL); -pure_core_init(loapic_0, NULL); +pre_kernel_core_init(loapic_0, NULL); #endif /* CONFIG_LOAPIC */ #if defined(CONFIG_PIC_DISABLE) DECLARE_DEVICE_INIT_CONFIG(pic_0, "", _i8259_init, NULL); -pure_core_init(pic_0, NULL); +pre_kernel_core_init(pic_0, NULL); #endif /* CONFIG_PIC_DISABLE */ diff --git a/arch/x86/platforms/ia32/ia32.c b/arch/x86/platforms/ia32/ia32.c index a3b94694495..e1f10cb1f24 100644 --- a/arch/x86/platforms/ia32/ia32.c +++ b/arch/x86/platforms/ia32/ia32.c @@ -99,20 +99,20 @@ pre_kernel_late_init(hpetirq, NULL); #ifdef CONFIG_IOAPIC DECLARE_DEVICE_INIT_CONFIG(ioapic_0, "", _ioapic_init, NULL); -pure_core_init(ioapic_0, NULL); +pre_kernel_core_init(ioapic_0, NULL); #endif /* CONFIG_IOAPIC */ #ifdef CONFIG_LOAPIC DECLARE_DEVICE_INIT_CONFIG(loapic_0, "", _loapic_init, NULL); -pure_core_init(loapic_0, NULL); +pre_kernel_core_init(loapic_0, NULL); #endif /* CONFIG_LOAPIC */ #if defined(CONFIG_PIC_DISABLE) DECLARE_DEVICE_INIT_CONFIG(pic_0, "", _i8259_init, NULL); -pure_core_init(pic_0, NULL); +pre_kernel_core_init(pic_0, NULL); #endif /* CONFIG_PIC_DISABLE */ diff --git a/arch/x86/platforms/ia32/ia32_config.c b/arch/x86/platforms/ia32/ia32_config.c index fab34e73444..406aa1504f9 100644 --- a/arch/x86/platforms/ia32/ia32_config.c +++ b/arch/x86/platforms/ia32/ia32_config.c @@ -122,7 +122,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0, #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 0)) -pure_core_init(ns16550_uart0, &ns16550_uart_dev_data[0]); +pre_kernel_core_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #else pre_kernel_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #endif /* CONFIG_EARLY_CONSOLE */ @@ -137,7 +137,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1, #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 1)) -pure_core_init(ns16550_uart1, &ns16550_uart_dev_data[1]); +pre_kernel_core_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #else pre_kernel_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #endif /* CONFIG_EARLY_CONSOLE */ diff --git a/arch/x86/platforms/ia32_pci/ia32_pci.c b/arch/x86/platforms/ia32_pci/ia32_pci.c index 954c1a744fc..fdd0aeb8eac 100644 --- a/arch/x86/platforms/ia32_pci/ia32_pci.c +++ b/arch/x86/platforms/ia32_pci/ia32_pci.c @@ -155,20 +155,20 @@ pre_kernel_late_init(hpetirq, NULL); #ifdef CONFIG_IOAPIC DECLARE_DEVICE_INIT_CONFIG(ioapic_0, "", _ioapic_init, NULL); -pure_core_init(ioapic_0, NULL); +pre_kernel_core_init(ioapic_0, NULL); #endif /* CONFIG_IOAPIC */ #ifdef CONFIG_LOAPIC DECLARE_DEVICE_INIT_CONFIG(loapic_0, "", _loapic_init, NULL); -pure_core_init(loapic_0, NULL); +pre_kernel_core_init(loapic_0, NULL); #endif /* CONFIG_LOAPIC */ #if defined(CONFIG_PIC_DISABLE) DECLARE_DEVICE_INIT_CONFIG(pic_0, "", _i8259_init, NULL); -pure_core_init(pic_0, NULL); +pre_kernel_core_init(pic_0, NULL); #endif /* CONFIG_PIC_DISABLE */ diff --git a/include/init.h b/include/init.h index 4c7674d25c9..b78b111107a 100644 --- a/include/init.h +++ b/include/init.h @@ -34,7 +34,7 @@ #include #include -#define PURE_CORE 0 +#define PRE_KERNEL_CORE 0 #define PRE_KERNEL_EARLY 1 #define PRE_KERNEL_LATE 2 #define NANO_EARLY 3 @@ -69,9 +69,9 @@ .driver_data = data} /* Run on interrupt stack; no {micro,nano} kernel objects available */ -#define pure_core_init(cfg, data) __define_initconfig(cfg, 0, data) -#define pre_kernel_early_init(cfg, data) __define_initconfig(cfg, 1, data) -#define pre_kernel_late_init(cfg, data) __define_initconfig(cfg, 2, data) +#define pre_kernel_core_init(cfg, data) __define_initconfig(cfg, 0, data) +#define pre_kernel_early_init(cfg, data) __define_initconfig(cfg, 1, data) +#define pre_kernel_late_init(cfg, data) __define_initconfig(cfg, 2, data) /* Run from nano kernel idle task; no micro kernel objects available */ #define nano_early_init(cfg, data) __define_initconfig(cfg, 3, data) diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c index 5ffabdd1422..b7062958b53 100644 --- a/kernel/nanokernel/nano_init.c +++ b/kernel/nanokernel/nano_init.c @@ -281,7 +281,7 @@ FUNC_NORETURN void _Cstart(void) /* perform basic hardware initialization */ - _sys_device_do_config_level(PURE_CORE); + _sys_device_do_config_level(PRE_KERNEL_CORE); _sys_device_do_config_level(PRE_KERNEL_EARLY); _sys_device_do_config_level(PRE_KERNEL_LATE);