From e2d3e3719257a6bfc85712bc36eecbb70b13904f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 10 Oct 2011 08:22:27 +0000 Subject: 2011-10-10 Sebastian Huber PR 1928/bsps: * mpc55xx/include/fsl-mpc567x.h: Revert previous change. * mpc55xx/misc/flash_support.c: Enable this file only for MPC55XX. --- c/src/lib/libcpu/powerpc/ChangeLog | 6 ++++++ c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h | 3 ++- c/src/lib/libcpu/powerpc/mpc55xx/misc/flash_support.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'c') 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 + + 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 * 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 #include +#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 */ -- cgit v1.2.3