X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fcommproc.h;h=63dcc4c9a3dcdf03c6195a6d404af7fc8d4ab0b8;hb=b4676a25e2feb15826d960f4a216c3c429d2de75;hp=c10525d4e874d9aa66993de83a858e9565fbc049;hpb=993cad9364c6b87ae429d1ed1130d8153f6f027e;p=u-boot diff --git a/include/commproc.h b/include/commproc.h index c10525d4e8..63dcc4c9a3 100644 --- a/include/commproc.h +++ b/include/commproc.h @@ -83,6 +83,12 @@ #define CPM_POST_WORD_ADDR CFG_CPM_POST_WORD_ADDR #endif +#ifndef CFG_CPM_BOOTCOUNT_ADDR +#define CPM_BOOTCOUNT_ADDR (CPM_POST_WORD_ADDR - 2*sizeof(ulong)) +#else +#define CPM_BOOTCOUNT_ADDR CFG_CPM_BOOTCOUNT_ADDR +#endif + #define BD_IIC_START ((uint) 0x0400) /* <- please use CPM_I2C_BASE !! */ /* Export the base address of the communication processor registers @@ -707,10 +713,10 @@ typedef struct scc_enet { /*** FADS860T********************************************************/ -#if defined(CONFIG_MPC860T) && defined(CONFIG_FADS) -/* This ENET stuff is for the MPC860TFADS with ethernet on SCC1. +#if (defined(CONFIG_MPC860T) || defined(CONFIG_MPC866_et_al)) \ + && defined(CONFIG_FADS) +/* This ENET stuff is for the MPC860TFADS/MPC8xxADS with ethernet on SCC1. */ - #ifdef CONFIG_SCC1_ENET #define SCC_ENET 0 #endif /* CONFIG_SCC1_ETHERNET */ @@ -1177,8 +1183,8 @@ typedef struct scc_enet { # endif /* CONFIG_FEC_ENET */ #endif /* CONFIG_SVM_SC8xx */ - - + + #if defined(CONFIG_NETVIA) /* Bits in parallel I/O port registers that have to be set/cleared * to configure the pins for SCC2 use.