Changes needed to get mcal_test working for mpc5604b

diff --git a/arch/ppc/mpc55xx/drivers/Adc.c b/arch/ppc/mpc55xx/drivers/Adc.c
index 213cfd61e34fed09dce1b2b364c3a01cd5b00132..3e1abd1e3f532170ab132abdfaeb782852b9a37a 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Adc.c
+++ b/arch/ppc/mpc55xx/drivers/Adc.c
@@ -274,8 +274,9 @@ Std_ReturnType Adc_DeInit (const Adc_ConfigType *ConfigPtr)
     }\r
 \r
     /* Disable DMA transfer*/\r
+#ifndef CFG_MPC5604B\r
     ADC_0.DMAE.B.DMAEN = 0;\r
-\r
+#endif\r
     /* Power down ADC */\r
     ADC_0.MCR.R = 0x0001;\r
 \r

diff --git a/arch/ppc/mpc55xx/drivers/MPC5604B_0M27V_0102.h b/arch/ppc/mpc55xx/drivers/MPC5604B_0M27V_0102.h
index 30cdcb45f2ab7376af5091bc588a2d82a82b4b64..e039df6d48acba928ffbf458594d36b5828d116e 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/MPC5604B_0M27V_0102.h
+++ b/arch/ppc/mpc55xx/drivers/MPC5604B_0M27V_0102.h
@@ -2961,7 +2961,7 @@ extern "C" {
                 vuint32_t MDIS:1;\r
                 vuint32_t FRZ:1;\r
             } B;\r
-        } PITMCR;\r
+        } MCR;\r
 \r
         uint32_t pit_reserved1[63];     /* (0x0100 - 0x0004)/4 = 0x3F */\r
 \r
@@ -3705,7 +3705,7 @@ extern "C" {
 | defines and macros (scope: module-local) \r
 |-----------------------------------------------------------------*/ \r
 /* Define instances of modules */ \r
-#define ADC       (*(volatile struct ADC_tag *)       0xFFE00000UL)\r
+#define ADC_0       (*(volatile struct ADC_tag *)       0xFFE00000UL)\r
 #define CAN_0     (*(volatile struct FLEXCAN_tag *)   0xFFFC0000UL)\r
 #define CAN_1     (*(volatile struct FLEXCAN_tag *)   0xFFFC4000UL)\r
 #define CAN_2     (*(volatile struct FLEXCAN_tag *)   0xFFFC8000UL)\r

diff --git a/arch/ppc/mpc55xx/drivers/Mcu.c b/arch/ppc/mpc55xx/drivers/Mcu.c
index c2c127bd08c8a6bae3bda727cdce816a6813fb00..305c590c8a98d5689c093193eab2d22157ff0b06 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Mcu.c
+++ b/arch/ppc/mpc55xx/drivers/Mcu.c
@@ -510,7 +510,9 @@ Std_ReturnType Mcu_InitClock(const Mcu_ClockType ClockSetting)
 void Mcu_DistributePllClock(void)\r
 {\r
     VALIDATE( ( 1 == Mcu_Global.initRun ), MCU_DISTRIBUTEPLLCLOCK_SERVICE_ID, MCU_E_UNINIT );\r
-#if defined(CFG_MPC5606S)\r
+#if defined(CFG_MPC5604B)\r
+    VALIDATE( ( CGM.FMPLL_CR.B.S_LOCK == 1 ), MCU_DISTRIBUTEPLLCLOCK_SERVICE_ID, MCU_E_PLL_NOT_LOCKED );\r
+#elif defined(CFG_MPC5606S)\r
     VALIDATE( ( CGM.FMPLL[0].CR.B.S_LOCK == 1 ), MCU_DISTRIBUTEPLLCLOCK_SERVICE_ID, MCU_E_PLL_NOT_LOCKED );\r
 #else\r
     VALIDATE( ( FMPLL.SYNSR.B.LOCK == 1 ), MCU_DISTRIBUTEPLLCLOCK_SERVICE_ID, MCU_E_PLL_NOT_LOCKED );\r

diff --git a/arch/ppc/mpc55xx/drivers/Port.c b/arch/ppc/mpc55xx/drivers/Port.c
index a09d429b3b8fb0422482d8cbcec00ec8b391bb83..8ff972a4a333b41199c92a5b2f22c7df15cf1d65 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Port.c
+++ b/arch/ppc/mpc55xx/drivers/Port.c
@@ -94,7 +94,7 @@ void Port_Init(const Port_ConfigType *configType)
 {\r
   VALIDATE_PARAM_CONFIG(configType, PORT_INIT_ID);\r
 \r
-#if defined(CFG_MPC560x)\r
+#if defined(CFG_MPC560X)\r
        vuint16_t i = 0;\r
        vuint16_t j = 0;\r
 \r

diff --git a/arch/ppc/mpc55xx/drivers/Pwm.c b/arch/ppc/mpc55xx/drivers/Pwm.c
index 2ab11278e349afb9e30007cc8f8ba5f27f4ac0b6..ad4e07da255fd55dcb160707850a50b26aef106b 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Pwm.c
+++ b/arch/ppc/mpc55xx/drivers/Pwm.c
@@ -221,7 +221,7 @@ void Pwm_Init(const Pwm_ConfigType* ConfigPtr) {
        return;\r
     }\r
 \r
-    #if defined(CFG_MPC5606S)\r
+    #if defined(CFG_MPC5606S) && !defined(CFG_MPC5604B)\r
                CGM.AC1_SC.R = 0x03000000; /* MPC56xxS: Select aux. set 1 clock to be FMPLL0 */\r
                CGM.AC2_SC.R = 0x03000000; /* MPC56xxS: Select aux. set 2 clock to be FMPLL0 */\r
        #endif\r

diff --git a/boards/mpc5604b_trk/build_config.mk b/boards/mpc5604b_trk/build_config.mk
index a82f6aee92faf62b984b3a0ea43620dddbcc8b1e..810f67c3123afaee1004845cd212abb6ee083df5 100644 (file)
--- a/boards/mpc5604b_trk/build_config.mk
+++ b/boards/mpc5604b_trk/build_config.mk
@@ -5,7 +5,7 @@ ARCH_FAM=ppc
 ARCH_MCU=mpc5604b\r
 \r
 # CFG (y/n) macros\r
-CFG=PPC E200Z0 MPC55XX MPC560x MPC5606S MPC5604B BRD_MPC5604B_TRK VLE\r
+CFG=PPC E200Z0 MPC55XX MPC560X MPC5606S MPC5604B BRD_MPC5604B_TRK VLE\r
 \r
 # What buildable modules does this board have, \r
 # default or private\r

diff --git a/boards/mpc5606s_xpc560s/build_config.mk b/boards/mpc5606s_xpc560s/build_config.mk
index b331cdf118e1d3a74e5646242e079b96c6d58cc9..bb62d50661eed1cffb8ba777b0f6e808e704cf3c 100644 (file)
--- a/boards/mpc5606s_xpc560s/build_config.mk
+++ b/boards/mpc5606s_xpc560s/build_config.mk
@@ -5,7 +5,7 @@ ARCH_FAM=ppc
 ARCH_MCU=mpc5606s\r
 \r
 # CFG (y/n) macros\r
-CFG=PPC E200Z0 MPC55XX MPC560x MPC5606S BRD_MPC560X_XPC560S VLE\r
+CFG=PPC E200Z0 MPC55XX MPC560X MPC5606S BRD_MPC560X_XPC560S VLE\r
 \r
 # What buildable modules does this board have, \r
 # default or private\r