diff options
Diffstat (limited to 'cpu/mpc8260')
| -rw-r--r-- | cpu/mpc8260/config.mk | 2 | ||||
| -rw-r--r-- | cpu/mpc8260/cpu.c | 4 | ||||
| -rw-r--r-- | cpu/mpc8260/ether_fcc.c | 7 | ||||
| -rw-r--r-- | cpu/mpc8260/serial_smc.c | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/cpu/mpc8260/config.mk b/cpu/mpc8260/config.mk index 3b2892481..dd7a71fdf 100644 --- a/cpu/mpc8260/config.mk +++ b/cpu/mpc8260/config.mk @@ -23,5 +23,5 @@ PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -PLATFORM_CPPFLAGS += -DCONFIG_8260 -ffixed-r2 -ffixed-r29 \ +PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \ -mstring -mcpu=603e -mmultiple diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index a34386f7c..5d979330a 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -137,13 +137,13 @@ int checkcpu (void) puts ("0.0 0K50M"); break; case 0x0C10: - puts ("1.0 0K50M"); + puts ("1.0 1K50M"); break; case 0x0D00: puts ("0.0 0K50M"); break; case 0x0D10: - puts ("1.0 0K50M"); + puts ("1.0 1K50M"); break; default: printf ("unknown [immr=0x%04x,k=0x%04x]", m, k); diff --git a/cpu/mpc8260/ether_fcc.c b/cpu/mpc8260/ether_fcc.c index 82f739070..0393afabc 100644 --- a/cpu/mpc8260/ether_fcc.c +++ b/cpu/mpc8260/ether_fcc.c @@ -628,6 +628,9 @@ swap16 (unsigned short x) return (((x & 0xff) << 8) | ((x & 0xff00) >> 8)); } +/* broadcast is not an error - we send them like that */ +#define BD_ENET_RX_ERRS (BD_ENET_RX_STATS & ~BD_ENET_RX_BC) + void eth_loopback_test (void) { @@ -1002,7 +1005,7 @@ eth_loopback_test (void) ecp->rxeacc._f++; } - if (sc & BD_ENET_RX_STATS) { + if (sc & BD_ENET_RX_ERRS) { ulong n; /* @@ -1033,7 +1036,7 @@ eth_loopback_test (void) ecp->rxeacc.cl++; bdp->cbd_sc &= \ - ~BD_ENET_RX_STATS; + ~BD_ENET_RX_ERRS; } else { ushort datlen = bdp->cbd_datlen; diff --git a/cpu/mpc8260/serial_smc.c b/cpu/mpc8260/serial_smc.c index 087331933..b486f8385 100644 --- a/cpu/mpc8260/serial_smc.c +++ b/cpu/mpc8260/serial_smc.c @@ -360,10 +360,10 @@ kgdb_serial_init (void) /* Set up the baud rate generator. */ #if defined(CONFIG_KGDB_USE_EXTC) - m8260_cpm_extcbrg(KGDB_SMC_INDEX, speed, + m8260_cpm_extcbrg(brg_map[KGDB_SMC_INDEX], speed, CONFIG_KGDB_EXTC_RATE, CONFIG_KGDB_EXTC_PINSEL); #else - m8260_cpm_setbrg(KGDB_SMC_INDEX, speed); + m8260_cpm_setbrg(brg_map[KGDB_SMC_INDEX], speed); #endif /* Make the first buffer the only buffer. |