summaryrefslogtreecommitdiff
path: root/include/ppc440.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-13 09:42:35 -0700
committerWolfgang Denk <wd@denx.de>2008-04-13 09:42:35 -0700
commit8c8428a576f632745306e288b629e30d420c0f5a (patch)
tree4ff35844d49c2278891d74bb37ff0928ec911b82 /include/ppc440.h
parent7754f33c6fb7a2c050388d20bf3847038558bdcf (diff)
parentd6f98e76a0a7db415e39c94bf3d2ad539ca9c60d (diff)
downloadu-boot-imx-8c8428a576f632745306e288b629e30d420c0f5a.zip
u-boot-imx-8c8428a576f632745306e288b629e30d420c0f5a.tar.gz
u-boot-imx-8c8428a576f632745306e288b629e30d420c0f5a.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/ppc440.h')
-rw-r--r--include/ppc440.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/ppc440.h b/include/ppc440.h
index 642d1de..bb39ad6 100644
--- a/include/ppc440.h
+++ b/include/ppc440.h
@@ -1731,17 +1731,10 @@
#else
#define CNTRL_DCR_BASE 0x0b0
#endif
-#if defined(CONFIG_440GX) || \
- defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
- defined(CONFIG_460EX) || defined(CONFIG_460GT)
+
#define cpc0_er (CNTRL_DCR_BASE+0x00) /* CPM enable register */
#define cpc0_fr (CNTRL_DCR_BASE+0x01) /* CPM force register */
#define cpc0_sr (CNTRL_DCR_BASE+0x02) /* CPM status register */
-#else
-#define cpc0_sr (CNTRL_DCR_BASE+0x00) /* CPM status register */
-#define cpc0_er (CNTRL_DCR_BASE+0x01) /* CPM enable register */
-#define cpc0_fr (CNTRL_DCR_BASE+0x02) /* CPM force register */
-#endif
#define cpc0_sys0 (CNTRL_DCR_BASE+0x30) /* System configuration reg 0 */
#define cpc0_sys1 (CNTRL_DCR_BASE+0x31) /* System configuration reg 1 */