renamed MPC55XX_CHIP_DERIVATE to MPC55XX_CHIP_TYPE

10 files changed, 46 insertions, 32 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[] = {
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 14ef039368..6ad8be57b4 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,5 +1,14 @@
 2010-04-07      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
+	* shared/include/cpuIdent.c, shared/include/cpuIdent.h: skip
+	version nibble when detecting e200 processor version
+	* mpc55xx/edma/edma.c, mpc55xx/include/irq.h,
+	mpc55xx/include/reg-defs.h, mpc55xx/include/regs.h,
+	mpc55xx/misc/copy.S, mpc55xx/misc/fmpll.S:
+	renamed MPC55XX_CHIP_DERIVATE to MPC55XX_CHIP_TYPE
+
+2010-04-07      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
 	* mpc55xx/edma/edma.c, mpc55xx/esci/esci.c, mpc55xx/include/irq.h,
 	mpc55xx/include/reg-defs.h, mpc55xx/include/regs.h,
 	mpc55xx/misc/copy.S, mpc55xx/misc/fmpll.S, mpc5xx/irq/irq_init.c,
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c b/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c
index c867fe74dd..71a529c111 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c
+++ b/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c
@@ -31,11 +31,11 @@
 
 #include <rtems/status-checks.h>
 
-#if   ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
+#if   ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
 #define MPC55XX_EDMA_CHANNEL_COUNT 16U
-#else /* ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517)) */
+#else /* ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517)) */
 #define MPC55XX_EDMA_CHANNEL_COUNT 64U
-#endif /* ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517)) */
+#endif /* ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517)) */
 
 #define MPC55XX_EDMA_INVALID_CHANNEL MPC55XX_EDMA_CHANNEL_COUNT
 
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
index fc7ea53744..37efaa7529 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
+++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h
@@ -47,11 +47,11 @@ extern "C" {
 #define MPC55XX_IRQ_SOFTWARE_GET_REQUEST( i) (i)
 #define MPC55XX_IRQ_SOFTWARE_NUMBER (MPC55XX_IRQ_SOFTWARE_MAX + 1U)
 
-#if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
-#else  /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
-#endif /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
+#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
+#else  /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
+#endif /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
 
-#if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
+#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
 
 /* eDMA interrupts */
 #define MPC55XX_IRQ_EDMA_ERROR_LOW 10U
@@ -78,7 +78,7 @@ extern "C" {
 #define MPC55XX_IRQ_EMIOS_GET_REQUEST( c) \
   ((c) + MPC55XX_IRQ_EMIOS_REQUEST_LOW_MIN)
 
-#else  /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
+#else  /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
 
 /* eDMA interrupts */
 #define MPC55XX_IRQ_EDMA_ERROR_LOW 10U
@@ -121,7 +121,7 @@ extern "C" {
    ? ((c) - 16U + MPC55XX_IRQ_EMIOS_REQUEST_HIGH_MIN) \
    : ((c) + MPC55XX_IRQ_EMIOS_REQUEST_LOW_MIN))
 
-#endif /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
+#endif /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
 
 /* Checks */
 #define MPC55XX_IRQ_IS_VALID(v) \
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h
index 338e8063b5..4a04931c64 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h
+++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h
@@ -25,7 +25,7 @@
 /*
  * Register addresses
  */
-#if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
+#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
 
 #define FMPLL_SYNSR   0xFFFF0004
 #define FMPLL_ESYNCR1 0xFFFF0008
@@ -43,7 +43,7 @@
 #define SIU_SYSCLK_SYSCLKSEL_XOSC 0x40000000
 #define SIU_SYSCLK_SYSCLKSEL_PLL  0x80000000
 
-#else /* ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
+#else /* ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
 
 #define FMPLL_SYNCR 0xC3F80000
 #define FMPLL_SYNSR 0xC3F80004
@@ -51,7 +51,7 @@
 #define SIU_ECCR 0xC3F90984
 #define SIU_SRCR 0xC3F90010
 
-#endif /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
+#endif /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
 /*
  * Special purpose registers
  */
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h
index 10dab8fe7c..c59847ee83 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h
+++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h
@@ -4390,7 +4390,7 @@ extern "C" {
         .MAS6 = { .R = 0 }
     };
 
-#if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
+#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
 /* Define memories */
 
 #define SRAM_START  0x40000000
@@ -4438,7 +4438,7 @@ extern "C" {
 #define EBI       (*(volatile struct EBI_tag *)       0xFFFF4000)
 #define FLASH     (*(volatile struct FLASH_tag *)     0xFFFF8000)
 
-#else /* ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517)) */
+#else /* ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517)) */
 /* Define memories */
 
 #define SRAM_START  0x40000000
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S b/c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S
index 7608b5c9ed..e2f9e1c5ee 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S
+++ b/c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S
@@ -32,9 +32,9 @@
  * to be aligned on 8 byte boundaries.  The size @a n must be evenly divisible by 8.
  * The SPE operations @b evxor, @b evlddx and @b evstddx will be used.
  */
-#if       ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
+#if       ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
 GLOBAL_FUNCTION mpc55xx_copy_8
-#endif /* ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
+#endif /* ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
 GLOBAL_FUNCTION mpc55xx_copy_4
 	/* Loop counter = data size / 4 */
 	srwi. r5, r5, 2
@@ -50,7 +50,7 @@ copy_data4:
 	/* Return */
 	blr
 
-#if  !((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
+#if  !((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
 /**
  * @fn int mpc55xx_copy_8( const void *src, void *dest, size_t n)
  *
@@ -77,7 +77,7 @@ copy_data:
 
 	/* Return */
 	blr
-#endif /*!((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))*/
+#endif /*!((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))*/
 
 /**
  * @fn int mpc55xx_zero_4( void *dest, size_t n)
@@ -87,10 +87,10 @@ copy_data:
  * The address @a dest has to be aligned on 4 byte boundaries.  The size @a n
  * must be evenly divisible by 4.  No SPE operations are used.
  */
-#if       ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
+#if       ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
 GLOBAL_FUNCTION mpc55xx_zero_32
 GLOBAL_FUNCTION mpc55xx_zero_8
-#endif /* ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
+#endif /* ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
 GLOBAL_FUNCTION mpc55xx_zero_4
 	/* Create zero */
 	xor r0, r0, r0
@@ -121,7 +121,7 @@ zero_big_data4:
 	bdnz zero_big_data4
 	/* Return */
 	blr
-#if      !((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
+#if      !((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
 /**
  * @fn int mpc55xx_zero_8( void *dest, size_t n)
  *
@@ -220,4 +220,4 @@ zero_big_line:
 
 	/* Return */
 	blr
-#endif  /*  !((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
+#endif  /*  !((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/misc/fmpll.S b/c/src/lib/libcpu/powerpc/mpc55xx/misc/fmpll.S
index 41d37c4b61..4fb99523d9 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/misc/fmpll.S
+++ b/c/src/lib/libcpu/powerpc/mpc55xx/misc/fmpll.S
@@ -44,7 +44,7 @@ GLOBAL_FUNCTION mpc55xx_fmpll_reset_config
 	/* Save link register */
 	mflr r9
 
-#if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
+#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
 	/*
 	 * for MPC5510: pass in ptr to array with:
 	 * off 0:  temp setting for ESYNCR2
@@ -131,7 +131,7 @@ fmpll_continue:
  * @brief Returns the system clock.
  */
 GLOBAL_FUNCTION mpc55xx_get_system_clock
-#if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
+#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
 	LA r4, FMPLL_ESYNCR1
 	lwz r3, 0(r4)
 	/* EPREDIV */