michaelh/zephyr
1
0
Fork 0
Code Releases Activity

init: rename pure_early_init to pre_kernel_early_init

Browse source 
Change-Id: Id52cd7a5c1a715a5c609f88f940ec2e27341d81e
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
This commit is contained in:
Dirk Brandewie 2015-09-25 13:02:12 -07:00 • committed by Anas Nashif
commit f96f61d2f0
9 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/platforms/galileo/galileo.c
View file

@ -80,7 +80,7 @@ static int gpio_irq_set_0(struct device *unused) {
} }
DECLARE_DEVICE_INIT_CONFIG(gpioirq_0, "", gpio_irq_set_0, NULL); 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 */ #endif /* CONFIG_GPIO_DW_0 */
@ -173,4 +173,4 @@ pure_core_init(pic_0, NULL);
#endif /* CONFIG_PIC_DISABLE */ #endif /* CONFIG_PIC_DISABLE */
DECLARE_DEVICE_INIT_CONFIG(galileo_0, "", galileo_init, NULL); DECLARE_DEVICE_INIT_CONFIG(galileo_0, "", galileo_init, NULL);
pure_early_init(galileo_0, NULL); pre_kernel_early_init(galileo_0, NULL);

4
arch/x86/platforms/galileo/galileo_config.c
View file

@ -135,7 +135,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0,
#if (defined(CONFIG_EARLY_CONSOLE) && \ #if (defined(CONFIG_EARLY_CONSOLE) && \
defined(CONFIG_UART_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \
(CONFIG_UART_CONSOLE_INDEX == 0)) (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 #else
pre_kernel_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pre_kernel_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */
@ -150,7 +150,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1,
#if (defined(CONFIG_EARLY_CONSOLE) && \ #if (defined(CONFIG_EARLY_CONSOLE) && \
defined(CONFIG_UART_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \
(CONFIG_UART_CONSOLE_INDEX == 1)) (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 #else
pre_kernel_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pre_kernel_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */

2
arch/x86/platforms/ia32/ia32.c
View file

@ -117,4 +117,4 @@ pure_core_init(pic_0, NULL);
#endif /* CONFIG_PIC_DISABLE */ #endif /* CONFIG_PIC_DISABLE */
DECLARE_DEVICE_INIT_CONFIG(ia32_0, "", ia32_init, NULL); DECLARE_DEVICE_INIT_CONFIG(ia32_0, "", ia32_init, NULL);
pure_early_init(ia32_0, NULL); pre_kernel_early_init(ia32_0, NULL);

4
arch/x86/platforms/ia32/ia32_config.c
View file

@ -124,7 +124,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0,
(CONFIG_UART_CONSOLE_INDEX == 0)) (CONFIG_UART_CONSOLE_INDEX == 0))
pure_core_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pure_core_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#else #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 */ #endif /* CONFIG_EARLY_CONSOLE */
@ -139,7 +139,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1,
(CONFIG_UART_CONSOLE_INDEX == 1)) (CONFIG_UART_CONSOLE_INDEX == 1))
pure_core_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pure_core_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#else #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 */ #endif /* CONFIG_EARLY_CONSOLE */

4
arch/x86/platforms/ia32_pci/ia32_pci.c
View file

@ -80,7 +80,7 @@ static int gpio_irq_set_0(struct device *unused) {
} }
DECLARE_DEVICE_INIT_CONFIG(gpioirq_0, "", gpio_irq_set_0, NULL); 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 */ #endif /* CONFIG_GPIO_DW_0 */
@ -173,4 +173,4 @@ pure_core_init(pic_0, NULL);
#endif /* CONFIG_PIC_DISABLE */ #endif /* CONFIG_PIC_DISABLE */
DECLARE_DEVICE_INIT_CONFIG(ia32_pci_0, "", ia32_pci_init, NULL); 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);

4
arch/x86/platforms/ia32_pci/ia32_pci_config.c
View file

@ -135,7 +135,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0,
#if (defined(CONFIG_EARLY_CONSOLE) && \ #if (defined(CONFIG_EARLY_CONSOLE) && \
defined(CONFIG_UART_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \
(CONFIG_UART_CONSOLE_INDEX == 0)) (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 #else
pre_kernel_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pre_kernel_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */
@ -150,7 +150,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1,
#if (defined(CONFIG_EARLY_CONSOLE) && \ #if (defined(CONFIG_EARLY_CONSOLE) && \
defined(CONFIG_UART_CONSOLE) && \ defined(CONFIG_UART_CONSOLE) && \
(CONFIG_UART_CONSOLE_INDEX == 1)) (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 #else
pre_kernel_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pre_kernel_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */

2
drivers/console/ram_console.c
View file

@ -60,5 +60,5 @@ static int ram_console_init(struct device *d)
} }
DECLARE_DEVICE_INIT_CONFIG(ram_console, "", ram_console_init, NULL); DECLARE_DEVICE_INIT_CONFIG(ram_console, "", ram_console_init, NULL);
pure_early_init(ram_console, NULL); pre_kernel_early_init(ram_console, NULL);

20
include/init.h
View file

@ -34,15 +34,15 @@
#include <device.h> #include <device.h>
#include <toolchain.h> #include <toolchain.h>
#define PURE_CORE 0 #define PURE_CORE 0
#define PURE_EARLY 1 #define PRE_KERNEL_EARLY 1
#define PRE_KERNEL_LATE 2 #define PRE_KERNEL_LATE 2
#define NANO_EARLY 3 #define NANO_EARLY 3
#define NANO_LATE 4 #define NANO_LATE 4
#define MICRO_EARLY 5 #define MICRO_EARLY 5
#define MICRO_LATE 6 #define MICRO_LATE 6
#define APP_EARLY 7 #define APP_EARLY 7
#define APP_LATE 8 #define APP_LATE 8
/** @def __define_initconfig /** @def __define_initconfig
* *
@ -70,7 +70,7 @@
/* Run on interrupt stack; no {micro,nano} kernel objects available */ /* Run on interrupt stack; no {micro,nano} kernel objects available */
#define pure_core_init(cfg, data) __define_initconfig(cfg, 0, data) #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) #define pre_kernel_late_init(cfg, data) __define_initconfig(cfg, 2, data)
/* Run from nano kernel idle task; no micro kernel objects available */ /* Run from nano kernel idle task; no micro kernel objects available */

2
kernel/nanokernel/nano_init.c
View file

@ -282,7 +282,7 @@ FUNC_NORETURN void _Cstart(void)
/* perform basic hardware initialization */ /* perform basic hardware initialization */
_sys_device_do_config_level(PURE_CORE); _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); _sys_device_do_config_level(PRE_KERNEL_LATE);
/* /*