Eliminate unnecessary references to cpu.h and cputype.h

Gets rid of places where there is no need to include these files
at all, or places where these files are being indirectly included
due to the inclusion of nanokernel.h.

Change-Id: I7b58148af454b977830c00a6b519a78d0595603b
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>

arch/arc/bsp/fatal_error.c

@@ -35,9 +35,7 @@ DESCRIPTION
 This module provides the _SysFatalErrorHandler() routine for ARCv2 BSPs.
 */
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
 #include "board.h"

arch/arc/core/fault.c

@@ -38,9 +38,7 @@
 #include <toolchain.h>
 #include <sections.h>
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <nanok.h>
 
 #ifdef CONFIG_PRINTK

arch/arm/bsp/sysFatalErrorHandler.c

@@ -35,9 +35,7 @@ DESCRIPTION
 This module provides the _SysFatalErrorHandler() routine for Cortex-M BSPs.
 */
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
 #include "board.h"

arch/arm/core/fault.c

@@ -38,9 +38,7 @@ Common fault handler for ARM Cortex-M processors.
 #include <toolchain.h>
 #include <sections.h>
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <nanok.h>
 
 #ifdef CONFIG_PRINTK

arch/arm/core/nanofatal.c

@@ -38,9 +38,7 @@ This module provides the _NanoFatalErrorHandler() routine for ARM Cortex-M.
 #include <toolchain.h>
 #include <sections.h>
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <nanok.h>
 
 #ifdef CONFIG_PRINTK

arch/arm/fsl_frdm_k64f/system.c

@@ -37,8 +37,6 @@ for the fsl_frdm_k64f BSP.
 */
 
 #include <nanokernel.h>
-#include <arch/cpu.h>
-#include <cputype.h>
 #include <board.h>
 #include <drivers/k20_mcg.h>
 #include <drivers/uart.h>

arch/arm/include/start_task_arch.h

@@ -45,7 +45,6 @@ Currently empty, only here for abstraction.
 
 #include <minik.h>
 #include <nanok.h>
-#include <cputype.h>
 #include <microkernel/task.h>
 
 #define _START_TASK_ARCH(pKproc, pOpt) \

arch/arm/ti_lm3s6965/system.c

@@ -37,8 +37,6 @@ for the ti_lm3s6965 BSP.
 */
 
 #include <nanokernel.h>
-#include <arch/cpu.h>
-#include <cputype.h>
 #include <board.h>
 #include <drivers/uart.h>
 

arch/arm/timer/systick.c

@@ -52,7 +52,6 @@ conjunction with a microkernel.
 */
 
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <misc/__assert.h>
@@ -62,7 +61,6 @@ conjunction with a microkernel.
 #ifdef CONFIG_MICROKERNEL
 
 #include <microkernel.h>
-#include <cputype.h>
 
 extern struct nano_stack _k_command_stack;
 

arch/x86/bsp/sysFatalErrorHandler.c

@@ -36,9 +36,7 @@ This module provides the _SysFatalErrorHandler() routine which is common to
 supported BSPs.
 */
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
 

arch/x86/core/nanofatal.c

@@ -38,9 +38,7 @@ This module provides the _NanoFatalErrorHandler() routine.
 #include <toolchain.h>
 #include <sections.h>
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <nanok.h>
 #include <misc/printk.h>
 

arch/x86/generic_pc/system.c

@@ -36,9 +36,7 @@ This module provides routines to initialize and support board-level hardware
 for the generic_pc BSP.
 */
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include "board.h"
 #include <drivers/uart.h>
 #include <drivers/pic.h>

arch/x86/include/start_task_arch.h

@@ -43,7 +43,6 @@ Intel-specific parts of start_task(). Only FP functionality currently.
 
 #include <minik.h>
 #include <nanok.h>
-#include <cputype.h>
 #include <microkernel/task.h>
 
 extern void _StartTaskArch(struct k_proc *, unsigned int *);

arch/x86/quark/system.c

@@ -39,9 +39,7 @@ Implementation Remarks:
 Handlers for the secondary serial port have not been added.
 */
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
 #include "board.h"

arch/x86/timer/hpet.c

@@ -65,7 +65,6 @@ In a nanokernel-only system this device driver omits more complex capabilities
 */
 
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <clock_vars.h>
@@ -74,7 +73,6 @@ In a nanokernel-only system this device driver omits more complex capabilities
 #ifdef CONFIG_MICROKERNEL
 
 #include <microkernel.h>
-#include <cputype.h>
 
 extern struct nano_stack _k_command_stack;
 

arch/x86/timer/loApicTimer.c

@@ -44,7 +44,6 @@ After reset, the timer is initialized to zero.
 */
 
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <clock_vars.h>
@@ -53,7 +52,6 @@ After reset, the timer is initialized to zero.
 
 #ifdef CONFIG_MICROKERNEL
 #include <microkernel.h>
-#include <cputype.h>
 #endif /* CONFIG_MICROKERNEL */
 
 /*

drivers/timer/i8253.c

@@ -50,7 +50,6 @@ directly invoke the VIOAPIC APIs to configure/unmask the IRQ.
 */
 
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <toolchain.h>
 #include <sections.h>
 #include <limits.h>
@@ -60,7 +59,6 @@ directly invoke the VIOAPIC APIs to configure/unmask the IRQ.
 #ifdef CONFIG_MICROKERNEL
 
 #include <microkernel.h>
-#include <cputype.h>
 
 #endif /* CONFIG_MICROKERNEL */
 

include/drivers/console/uart_console.h

@@ -37,7 +37,6 @@
 extern "C" {
 #endif
 
-#include <cputype.h>
 #include <nanokernel.h>
 
 extern void uart_console_init(void);

include/linker-defs.h

@@ -97,12 +97,6 @@ extern char __data_ram_start[];
 extern int __data_num_words[];
 #endif
 
-/* C FILES: declaration defined by the linker script */
-
-#ifdef VXMICRO_ARCH_x86
-#include <cputype.h>
-#endif /* VXMICRO_ARCH_x86 */
-
 /* end address of image. */
 extern char _end[];
 #define _END_VPAGE (VIRT_ADDR) _end

include/microkernel/k_types.h

@@ -33,7 +33,7 @@
 #ifndef K_TYPES_H
 #define K_TYPES_H
 
-#include <cputype.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

kernel/microkernel/idle.c

@@ -281,9 +281,7 @@ unsigned char _sys_power_save_flag = 1;
 
 #if defined(CONFIG_ADVANCED_POWER_MANAGEMENT)
 
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <microkernel/k_types.h>
 #ifdef CONFIG_ADVANCED_IDLE
 #include <advidle.h>

kernel/nanokernel/nano_init.c

@@ -36,9 +36,7 @@ This module contains routines that are used to initialize the nanokernel.
 */
 
 #include <offsets.h>
-#include <cputype.h>
 #include <nanokernel.h>
-#include <arch/cpu.h>
 #include <misc/printk.h>
 #include <drivers/rand32.h>
 #include <sections.h>

kernel/nanokernel/version.c

@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cputype.h>
+#include <stdint.h>
 #include "version.h" /* generated by MAKE, at compile time */
 
 static uint32_t kernel_version = KERNELVERSION;