summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc
diff options
context:
space:
mode:
authorThomas Doerfler <Thomas.Doerfler@embedded-brains.de>2010-04-07 14:19:55 +0000
committerThomas Doerfler <Thomas.Doerfler@embedded-brains.de>2010-04-07 14:19:55 +0000
commit88919d021e0cfd4c24bf37acd0fe083f831dd267 (patch)
tree6eeba8daccf8f18c8ff29595a424b9ac08d8fd60 /c/src/lib/libbsp/powerpc
parentskip version nibble when detecting e200 processor version (diff)
downloadrtems-88919d021e0cfd4c24bf37acd0fe083f831dd267.tar.bz2
renamed MPC55XX_CHIP_DERIVATE to MPC55XX_CHIP_TYPE
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac10
-rw-r--r--c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c6
3 files changed, 13 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
index 52b8cadf7a..505a0e029e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-07 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
+ * configure.ac, startup/bspstart.c:
+ renamed MPC55XX_CHIP_DERIVATE to MPC55XX_CHIP_TYPE
+
2010-04-07 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* Makefile.am, configure.ac, preinstall.am, clock/clock-config.c,
make/custom/gwlcfm.cfg, make/custom/mpc5566evb.cfg,
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
index 69275112c1..f2f5dccb21 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac
@@ -87,11 +87,11 @@ RTEMS_BSPOPTS_SET([MPC55XX_EMIOS_PRESCALER],[*] ,[0])
RTEMS_BSPOPTS_HELP([MPC55XX_EMIOS_PRESCALER],
[Must be defined to set the EMIOS prescaler])
-RTEMS_BSPOPTS_SET([MPC55XX_CHIP_DERIVATE],[mpc5566evb],[5566])
-RTEMS_BSPOPTS_SET([MPC55XX_CHIP_DERIVATE],[gwlcfm] ,[5516])
-RTEMS_BSPOPTS_SET([MPC55XX_CHIP_DERIVATE],[*] ,[5554])
-RTEMS_BSPOPTS_HELP([MPC55XX_CHIP_DERIVATE],
-[specifies the chip derivate in use (e.g. 5554 for MPC5554)])
+RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[mpc5566evb],[5566])
+RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[gwlcfm] ,[5516])
+RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[*] ,[5554])
+RTEMS_BSPOPTS_HELP([MPC55XX_CHIP_TYPE],
+[specifies the chip type in use (e.g. 5554 for MPC5554)])
RTEMS_BSPOPTS_SET([BOARD_GWLCFM],[gwlcfm],[1])
RTEMS_BSPOPTS_HELP([BOARD_GWLCFM],
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
index 4835c93ddf..c2fb8c501e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
@@ -92,7 +92,7 @@ void bsp_predriver_hook()
}
}
-#if ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
+#if ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
/*
* define init values for FMPLL ESYNCRx
* (used in start.S/fmpll.S)
@@ -136,7 +136,7 @@ const struct fmpll_syncr_vals_t {
}
};
-#else /* ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
+#else /* ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
const struct fmpll_syncr_vals_t {
union SYNCR_tag syncr_temp;
@@ -157,7 +157,7 @@ const struct fmpll_syncr_vals_t {
}
};
-#endif /* ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
+#endif /* ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
#if defined(BOARD_GWLCFM)
static const mpc55xx_siu_pcr_entry_t siu_pcr_list[] = {