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/immap_85xx.h | |
| parent | 2d5df63e4f596fe439405048fd85157cdff079dc (diff) | |
| download | bootable_bootloader_goldelico_gta04-9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5.zip bootable_bootloader_goldelico_gta04-9c4c5ae3e10e4f2ca799aacbb74e1f5adb86e0b5.tar.gz bootable_bootloader_goldelico_gta04-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/immap_85xx.h')
| -rw-r--r-- | include/asm-ppc/immap_85xx.h | 4 |
1 files changed, 1 insertions, 3 deletions
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; |