From c2bc9efe85769d3a086703dece6e08a367853e96 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 26 Sep 2011 10:03:30 +0000 Subject: [PATCH] 2011-09-27 Sebastian Huber * mpc83xx/include/mpc83xx.h, mpc83xx/network/tsec.c: Update due to API changes. --- c/src/lib/libcpu/powerpc/ChangeLog | 5 +++++ c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h | 10 ++++------ c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 4342d4895d..e20d507b27 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2011-09-27 Sebastian Huber + + * mpc83xx/include/mpc83xx.h, mpc83xx/network/tsec.c: Update due to API + changes. + 2011-09-01 Sebastian Huber * mpc55xx/include/fsl-mpc567x.h: Added FLASH as an alias to FLASH_A. diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h b/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h index 5d956d2452..86f9b550c5 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h +++ b/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h @@ -7,23 +7,21 @@ #include -#if defined(MPC8343) +#if MPC83XX_CHIP_TYPE == 8343 #define M83xx_HAS_PCI TRUE #define M83xx_HAS_USB1 TRUE -#elif defined(MPC8347) +#elif MPC83XX_CHIP_TYPE == 8347 #define M83xx_HAS_PCI TRUE #define M83xx_HAS_USB1 TRUE #define M83xx_HAS_USB2 TRUE -#elif defined(MPC8349) +#elif MPC83XX_CHIP_TYPE == 8349 #define M83xx_HAS_PCI TRUE #define M83xx_HAS_WIDE_PCI TRUE #define M83xx_HAS_USB1 TRUE #define M83xx_HAS_USB2 TRUE -#elif defined(MPC8360) +#elif MPC83XX_CHIP_TYPE == 8360 #define M83xx_HAS_PCI TRUE #define M83xx_HAS_QE TRUE -#else -#error "add feature list in mpc83xx_regs.h" #endif #if !defined(ASM) diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c b/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c index 7a4161053b..597cf4ee8d 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c +++ b/c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c @@ -1507,7 +1507,7 @@ static void tsec_init sc->reg_ptr->rctrl &= ~TSEC_RCTRL_PROM; } -#if defined(HSC_CM01) +#if defined(MPC83XX_BOARD_HSC_CM01) /* * for HSC CM01: we need to configure the PHY to use maximum skew adjust */