diff options
| author | Jon Loeliger <[email protected]> | 2006-05-09 08:33:11 -0500 |
|---|---|---|
| committer | Jon Loeliger <[email protected]> | 2006-05-09 08:33:11 -0500 |
| commit | a67255363ae4c8a7c67a83e05de335cdb54b2045 (patch) | |
| tree | 4857056ed42e56140c6f6f60197a1fad4f2ea6fd /include/common.h | |
| parent | 4af099bda90fe602aff96b2fd914fca89f320c5c (diff) | |
| parent | 18b6c8cd8af6cc7f35180cedc4adb3236cc1a1b8 (diff) | |
Merge branch 'mpc86xx'
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 5d8b15628b5..83ccf7c9877 100644 --- a/include/common.h +++ b/include/common.h @@ -79,6 +79,10 @@ typedef volatile unsigned char vu_char; #endif #include <asm/immap_8260.h> #endif +#ifdef CONFIG_MPC86xx +#include <mpc86xx.h> +#include <asm/immap_86xx.h> +#endif #ifdef CONFIG_MPC85xx #include <mpc85xx.h> #include <asm/immap_85xx.h> @@ -366,6 +370,7 @@ void trap_init (ulong); defined (CONFIG_74xx) || \ defined (CONFIG_MPC8220) || \ defined (CONFIG_MPC85xx) || \ + defined (CONFIG_MPC86xx) || \ defined (CONFIG_MPC83XX) unsigned char in8(unsigned int); void out8(unsigned int, unsigned char); @@ -454,6 +459,10 @@ ulong get_bus_freq (ulong); typedef MPC85xx_SYS_INFO sys_info_t; void get_sys_info ( sys_info_t * ); #endif +#if defined(CONFIG_MPC86xx) +typedef MPC86xx_SYS_INFO sys_info_t; +void get_sys_info ( sys_info_t * ); +#endif #if defined(CONFIG_4xx) || defined(CONFIG_IOP480) # if defined(CONFIG_440) @@ -468,7 +477,7 @@ void get_sys_info ( sys_info_t * ); #if defined(CONFIG_8xx) || defined(CONFIG_8260) void cpu_init_f (volatile immap_t *immr); #endif -#if defined(CONFIG_4xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MCF52x2) +#if defined(CONFIG_4xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MCF52x2) ||defined(CONFIG_MPC86xx) void cpu_init_f (void); #endif |