diff --git a/arch/x86/platforms/galileo/galileo.c b/arch/x86/platforms/galileo/galileo.c index 2f971027b39..18b39e26e22 100644 --- a/arch/x86/platforms/galileo/galileo.c +++ b/arch/x86/platforms/galileo/galileo.c @@ -80,7 +80,7 @@ static int gpio_irq_set_0(struct device *unused) { } DECLARE_DEVICE_INIT_CONFIG(gpioirq_0, "", gpio_irq_set_0, NULL); -pure_early_init(gpioirq_0, NULL); +pre_kernel_early_init(gpioirq_0, NULL); #endif /* CONFIG_GPIO_DW_0 */ @@ -173,4 +173,4 @@ pure_core_init(pic_0, NULL); #endif /* CONFIG_PIC_DISABLE */ DECLARE_DEVICE_INIT_CONFIG(galileo_0, "", galileo_init, NULL); -pure_early_init(galileo_0, NULL); +pre_kernel_early_init(galileo_0, NULL); diff --git a/arch/x86/platforms/galileo/galileo_config.c b/arch/x86/platforms/galileo/galileo_config.c index 7571a18d0c8..dabf7744ab1 100644 --- a/arch/x86/platforms/galileo/galileo_config.c +++ b/arch/x86/platforms/galileo/galileo_config.c @@ -135,7 +135,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0, #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 0)) -pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); +pre_kernel_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #else pre_kernel_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #endif /* CONFIG_EARLY_CONSOLE */ @@ -150,7 +150,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1, #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 1)) -pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); +pre_kernel_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #else pre_kernel_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #endif /* CONFIG_EARLY_CONSOLE */ diff --git a/arch/x86/platforms/ia32/ia32.c b/arch/x86/platforms/ia32/ia32.c index d82e0cd84e3..a3b94694495 100644 --- a/arch/x86/platforms/ia32/ia32.c +++ b/arch/x86/platforms/ia32/ia32.c @@ -117,4 +117,4 @@ pure_core_init(pic_0, NULL); #endif /* CONFIG_PIC_DISABLE */ DECLARE_DEVICE_INIT_CONFIG(ia32_0, "", ia32_init, NULL); -pure_early_init(ia32_0, NULL); +pre_kernel_early_init(ia32_0, NULL); diff --git a/arch/x86/platforms/ia32/ia32_config.c b/arch/x86/platforms/ia32/ia32_config.c index a45ce019623..fab34e73444 100644 --- a/arch/x86/platforms/ia32/ia32_config.c +++ b/arch/x86/platforms/ia32/ia32_config.c @@ -124,7 +124,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0, (CONFIG_UART_CONSOLE_INDEX == 0)) pure_core_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #else -pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); +pre_kernel_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #endif /* CONFIG_EARLY_CONSOLE */ @@ -139,7 +139,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1, (CONFIG_UART_CONSOLE_INDEX == 1)) pure_core_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #else -pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); +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 ba1d7f37443..954c1a744fc 100644 --- a/arch/x86/platforms/ia32_pci/ia32_pci.c +++ b/arch/x86/platforms/ia32_pci/ia32_pci.c @@ -80,7 +80,7 @@ static int gpio_irq_set_0(struct device *unused) { } DECLARE_DEVICE_INIT_CONFIG(gpioirq_0, "", gpio_irq_set_0, NULL); -pure_early_init(gpioirq_0, NULL); +pre_kernel_early_init(gpioirq_0, NULL); #endif /* CONFIG_GPIO_DW_0 */ @@ -173,4 +173,4 @@ pure_core_init(pic_0, NULL); #endif /* CONFIG_PIC_DISABLE */ DECLARE_DEVICE_INIT_CONFIG(ia32_pci_0, "", ia32_pci_init, NULL); -pure_early_init(ia32_pci_0, NULL); +pre_kernel_early_init(ia32_pci_0, NULL); diff --git a/arch/x86/platforms/ia32_pci/ia32_pci_config.c b/arch/x86/platforms/ia32_pci/ia32_pci_config.c index 249734e775a..55e92190ebd 100644 --- a/arch/x86/platforms/ia32_pci/ia32_pci_config.c +++ b/arch/x86/platforms/ia32_pci/ia32_pci_config.c @@ -135,7 +135,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0, #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 0)) -pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); +pre_kernel_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #else pre_kernel_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]); #endif /* CONFIG_EARLY_CONSOLE */ @@ -150,7 +150,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1, #if (defined(CONFIG_EARLY_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \ (CONFIG_UART_CONSOLE_INDEX == 1)) -pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); +pre_kernel_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #else pre_kernel_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]); #endif /* CONFIG_EARLY_CONSOLE */ diff --git a/drivers/console/ram_console.c b/drivers/console/ram_console.c index 5972f228385..81fe346d307 100644 --- a/drivers/console/ram_console.c +++ b/drivers/console/ram_console.c @@ -60,5 +60,5 @@ static int ram_console_init(struct device *d) } DECLARE_DEVICE_INIT_CONFIG(ram_console, "", ram_console_init, NULL); -pure_early_init(ram_console, NULL); +pre_kernel_early_init(ram_console, NULL); diff --git a/include/init.h b/include/init.h index 502e30f93ad..4c7674d25c9 100644 --- a/include/init.h +++ b/include/init.h @@ -34,15 +34,15 @@ #include #include -#define PURE_CORE 0 -#define PURE_EARLY 1 -#define PRE_KERNEL_LATE 2 -#define NANO_EARLY 3 -#define NANO_LATE 4 -#define MICRO_EARLY 5 -#define MICRO_LATE 6 -#define APP_EARLY 7 -#define APP_LATE 8 +#define PURE_CORE 0 +#define PRE_KERNEL_EARLY 1 +#define PRE_KERNEL_LATE 2 +#define NANO_EARLY 3 +#define NANO_LATE 4 +#define MICRO_EARLY 5 +#define MICRO_LATE 6 +#define APP_EARLY 7 +#define APP_LATE 8 /** @def __define_initconfig * @@ -70,7 +70,7 @@ /* Run on interrupt stack; no {micro,nano} kernel objects available */ #define pure_core_init(cfg, data) __define_initconfig(cfg, 0, data) -#define pure_early_init(cfg, data) __define_initconfig(cfg, 1, 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 */ diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c index 0dbbfec618d..5ffabdd1422 100644 --- a/kernel/nanokernel/nano_init.c +++ b/kernel/nanokernel/nano_init.c @@ -282,7 +282,7 @@ FUNC_NORETURN void _Cstart(void) /* perform basic hardware initialization */ _sys_device_do_config_level(PURE_CORE); - _sys_device_do_config_level(PURE_EARLY); + _sys_device_do_config_level(PRE_KERNEL_EARLY); _sys_device_do_config_level(PRE_KERNEL_LATE); /*