diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-10-10 08:22:27 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-10-10 08:22:27 +0000 |
| commit | e2d3e3719257a6bfc85712bc36eecbb70b13904f (patch) | |
| tree | a60065d9d62192d4cd7c89fedcc9561c94cb1b06 /c | |
| parent | 2011-10-10 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-e2d3e3719257a6bfc85712bc36eecbb70b13904f.tar.bz2 | |
2011-10-10 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1928/bsps:
* mpc55xx/include/fsl-mpc567x.h: Revert previous change.
* mpc55xx/misc/flash_support.c: Enable this file only for MPC55XX.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h | 3 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index b008886c90..ffe3df9511 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2011-10-10 Sebastian Huber <sebastian.huber@embedded-brains.de> + + PR 1928/bsps: + * mpc55xx/include/fsl-mpc567x.h: Revert previous change. + * mpc55xx/misc/flash_support.c: Enable this file only for MPC55XX. + 2011-10-07 Ralf Corsépius <ralf.corsepius@rtems.org> * ppc403/clock/clock.c (ClockOn): Define pvr only for "ifndef ppc405". diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h index 40db474f2b..7b77a53a50 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h +++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h @@ -639,7 +639,8 @@ extern "C" { uint32_t R; struct { uint32_t:5; - uint32_t SIZE:4; + uint32_t SIZE:3; + uint32_t:1; uint32_t LAS:3; uint32_t:3; uint32_t MAS:1; diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c b/c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c index 4df9ab8de0..3dfb5fe660 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c +++ b/c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c @@ -37,6 +37,8 @@ #include <libcpu/powerpc-utility.h> #include <rtems/powerpc/registers.h> +#if MPC55XX_CHIP_TYPE / 100 == 55 + /* Set up the memory ranges for the flash on * the MPC5553, MPC5554, MPC5566 and MPC5567. * I check if it is an unknown CPU and return an error. @@ -695,3 +697,5 @@ mpc55xx_flash_address(void) return mas2 & 0xFFFFF000; } + +#endif /* MPC55XX_CHIP_TYPE / 100 == 55 */ |