diff options
| author | Jon Loeliger <jdl@freescale.com> | 2005-07-23 10:37:35 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2005-07-23 10:37:35 -0500 |
| commit | 9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5 (patch) | |
| tree | ce06516d3935e9f3e2dac253a78742c7d3c211df /include/asm-ppc | |
| parent | 2d5df63e4f596fe439405048fd85157cdff079dc (diff) | |
| download | u-boot-imx-9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5.zip u-boot-imx-9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5.tar.gz u-boot-imx-9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5.tar.bz2 | |
* Patch by Jon Loeliger, Kumar Gala 2005-02-08
- Convert the CPM2 based functionality to use new CONFIG_CPM2
option rather than a myriad of CONFIG_MPC8560-like variants.
Applies to MPC85xx and MPC8260 boards, includes stxgp3 and sbc8560.
Eliminates the CONFIG_MPC8560 option entirely. Distributes the
new CONFIG_CPM2 option to each 8260 board.
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/global_data.h | 4 | ||||
| -rw-r--r-- | include/asm-ppc/immap_85xx.h | 4 | ||||
| -rw-r--r-- | include/asm-ppc/u-boot.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index c800f63..2b57a8b 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -39,7 +39,7 @@ typedef struct global_data { unsigned long baudrate; unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long bus_clk; -#if defined(CONFIG_8260) || defined(CONFIG_MPC8560) +#if defined(CONFIG_CPM2) /* There are many clocks on the MPC8260 - see page 9-5 */ unsigned long vco_out; unsigned long cpm_clk; @@ -64,7 +64,7 @@ typedef struct global_data { unsigned long env_addr; /* Address of Environment struct */ unsigned long env_valid; /* Checksum of Environment valid? */ unsigned long have_console; /* serial_init() was called */ -#if defined(CFG_ALLOC_DPRAM) || defined(CONFIG_8260) || defined(CONFIG_MPC8560) +#if defined(CFG_ALLOC_DPRAM) || defined(CONFIG_CPM2) unsigned int dp_alloc_base; unsigned int dp_alloc_top; #endif diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h index 1b73def..e9bb989 100644 --- a/include/asm-ppc/immap_85xx.h +++ b/include/asm-ppc/immap_85xx.h @@ -1025,9 +1025,7 @@ typedef struct ccsr_pic { } ccsr_pic_t; /* CPM Block(0x8_0000-0xc_0000) */ -#if defined(CONFIG_MPC8540) \ - || defined(CONFIG_MPC8541) \ - || defined(CONFIG_MPC8555) +#ifndef CONFIG_CPM2 typedef struct ccsr_cpm { char res[262144]; } ccsr_cpm_t; diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h index f8282d4..5da0e68 100644 --- a/include/asm-ppc/u-boot.h +++ b/include/asm-ppc/u-boot.h @@ -59,7 +59,7 @@ typedef struct bd_info { unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ unsigned long bi_intfreq; /* Internal Freq, in MHz */ unsigned long bi_busfreq; /* Bus Freq, in MHz */ -#if defined(CONFIG_8260) || defined(CONFIG_MPC8560) +#if defined(CONFIG_CPM2) unsigned long bi_cpmfreq; /* CPM_CLK Freq, in MHz */ unsigned long bi_brgfreq; /* BRG_CLK Freq, in MHz */ unsigned long bi_sccfreq; /* SCC_CLK Freq, in MHz */ |