michaelh/zephyr
1
0
Fork 0
Code Releases Activity

init: rename pure_core_init to pre_kernel_core_init

Browse source 
Change-Id: If61a5bdc9831c7375492446b02ecae513f054de4
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 4db419b6fa
9 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arc/platforms/generic_arc/system.c
View file

@ -66,4 +66,4 @@ static int generic_arc_init(struct device *arg)
return 0; return 0;
} }
DECLARE_DEVICE_INIT_CONFIG(generic_arc_0, "", generic_arc_init, NULL); 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);

2
arch/arm/platforms/fsl_frdm_k64f/system.c
View file

@ -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); 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);

2
arch/arm/platforms/ti_lm3s6965/system.c
View file

@ -71,4 +71,4 @@ static int ti_lm3s6965_init(struct device *arg)
} }
DECLARE_DEVICE_INIT_CONFIG(ti_lm3_0, "", ti_lm3s6965_init, NULL); 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);

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

@ -149,26 +149,26 @@ static int hpet_irq_set(struct device *unused)
} }
DECLARE_DEVICE_INIT_CONFIG(hpetirq, "", hpet_irq_set, NULL); DECLARE_DEVICE_INIT_CONFIG(hpetirq, "", hpet_irq_set, NULL);
pure_core_init(hpetirq, NULL); pre_kernel_core_init(hpetirq, NULL);
#endif /* CONFIG_HPET_TIMER */ #endif /* CONFIG_HPET_TIMER */
#ifdef CONFIG_IOAPIC #ifdef CONFIG_IOAPIC
DECLARE_DEVICE_INIT_CONFIG(ioapic_0, "", _ioapic_init, NULL); 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 */ #endif /* CONFIG_IOAPIC */
#ifdef CONFIG_LOAPIC #ifdef CONFIG_LOAPIC
DECLARE_DEVICE_INIT_CONFIG(loapic_0, "", _loapic_init, NULL); 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 */ #endif /* CONFIG_LOAPIC */
#if defined(CONFIG_PIC_DISABLE) #if defined(CONFIG_PIC_DISABLE)
DECLARE_DEVICE_INIT_CONFIG(pic_0, "", _i8259_init, NULL); 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 */ #endif /* CONFIG_PIC_DISABLE */

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

@ -99,20 +99,20 @@ pre_kernel_late_init(hpetirq, NULL);
#ifdef CONFIG_IOAPIC #ifdef CONFIG_IOAPIC
DECLARE_DEVICE_INIT_CONFIG(ioapic_0, "", _ioapic_init, NULL); 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 */ #endif /* CONFIG_IOAPIC */
#ifdef CONFIG_LOAPIC #ifdef CONFIG_LOAPIC
DECLARE_DEVICE_INIT_CONFIG(loapic_0, "", _loapic_init, NULL); 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 */ #endif /* CONFIG_LOAPIC */
#if defined(CONFIG_PIC_DISABLE) #if defined(CONFIG_PIC_DISABLE)
DECLARE_DEVICE_INIT_CONFIG(pic_0, "", _i8259_init, NULL); 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 */ #endif /* CONFIG_PIC_DISABLE */

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

@ -122,7 +122,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_core_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pre_kernel_core_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#else #else
pre_kernel_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 */
@ -137,7 +137,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_core_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pre_kernel_core_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#else #else
pre_kernel_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 */

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

@ -155,20 +155,20 @@ pre_kernel_late_init(hpetirq, NULL);
#ifdef CONFIG_IOAPIC #ifdef CONFIG_IOAPIC
DECLARE_DEVICE_INIT_CONFIG(ioapic_0, "", _ioapic_init, NULL); 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 */ #endif /* CONFIG_IOAPIC */
#ifdef CONFIG_LOAPIC #ifdef CONFIG_LOAPIC
DECLARE_DEVICE_INIT_CONFIG(loapic_0, "", _loapic_init, NULL); 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 */ #endif /* CONFIG_LOAPIC */
#if defined(CONFIG_PIC_DISABLE) #if defined(CONFIG_PIC_DISABLE)
DECLARE_DEVICE_INIT_CONFIG(pic_0, "", _i8259_init, NULL); 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 */ #endif /* CONFIG_PIC_DISABLE */

8
include/init.h
View file

@ -34,7 +34,7 @@
#include <device.h> #include <device.h>
#include <toolchain.h> #include <toolchain.h>
#define PURE_CORE 0 #define PRE_KERNEL_CORE 0
#define PRE_KERNEL_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
@ -69,9 +69,9 @@
.driver_data = data} .driver_data = data}
/* 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 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_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 */
#define nano_early_init(cfg, data) __define_initconfig(cfg, 3, data) #define nano_early_init(cfg, data) __define_initconfig(cfg, 3, data)

2
kernel/nanokernel/nano_init.c
View file

@ -281,7 +281,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(PRE_KERNEL_CORE);
_sys_device_do_config_level(PRE_KERNEL_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);