Ticket 1697, add schm for all targets and make sure default compile works

diff --git a/system/SchM/SchM_cfg.h b/boards/generic/SchM_cfg.h
similarity index 95%
rename from system/SchM/SchM_cfg.h
rename to boards/generic/SchM_cfg.h
index b45eb9914bbb5c35abd3389ebd8fa4f4c3a07810..1178a53cdb1d41b07edf42ded61daa0d9ca70d9b 100644 (file)
--- a/system/SchM/SchM_cfg.h
+++ b/boards/generic/SchM_cfg.h
@@ -17,6 +17,7 @@
 #ifndef SCHM_CFG_H_\r
 #define SCHM_CFG_H_\r
 \r
+#warning "This default file may only be used as an example!"\r
 \r
 #define SCHM_MF_MEM_PERIOD             20\r
 \r

diff --git a/boards/hcs12x_elmicro_tboard/build_config.mk b/boards/hcs12x_elmicro_tboard/build_config.mk
index 6d3ba2054511fffc378bbd582f2181f3e3339f5a..71e07723ff9d05e8a476098b79af3d1714ef80a1 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/build_config.mk
+++ b/boards/hcs12x_elmicro_tboard/build_config.mk
@@ -9,7 +9,7 @@ CFG=HC1X HCS12XD MC912XDP512 BRD_HCS12X_ELMICRO_TBOARD SIMULATOR
 \r
 # What buildable modules does this board have, \r
 # default or private (These become MOD_XXX=y )\r
-MOD_AVAIL+=KERNEL MCU GPT DIO PORT COM CAN CANIF PWM ADC DEM DCM PDUR CANTP RTE IOHWAB DET ECUM RAMLOG\r
+MOD_AVAIL+=KERNEL MCU GPT DIO PORT COM CAN CANIF PWM ADC DEM DCM PDUR CANTP RTE IOHWAB DET ECUM RAMLOG SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM NVM MEMIF EA FEE\r
 # CRC\r

diff --git a/boards/mpc5516it/build_config.mk b/boards/mpc5516it/build_config.mk
index c3e5d74b7d5526c9f2f8d025351a40e7723dd1dc..3ee2ad35b639721c66db253b2497f942a4d8e5a3 100644 (file)
--- a/boards/mpc5516it/build_config.mk
+++ b/boards/mpc5516it/build_config.mk
@@ -13,11 +13,11 @@ CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BRD_MPC5516IT
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP \r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP LINIF COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP\r
+MOD_AVAIL+=CANIF CANTP LINIF COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM EA LINSM\r
 # Additional\r
-MOD_AVAIL+= RAMLOG SCHM\r
+MOD_AVAIL+= RAMLOG\r
 # CRC\r
 MOD_AVAIL+=CRC32 CRC16\r
 # Required modules\r

diff --git a/boards/mpc551xsim/build_config.mk b/boards/mpc551xsim/build_config.mk
index 4f62207913bc3aef2b2dc8a98d19c824d16b3265..44e8c7381c60c96ba5cfa038d7feff0cb6c5f51d 100644 (file)
--- a/boards/mpc551xsim/build_config.mk
+++ b/boards/mpc551xsim/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BRD_MPC551XSIM SIMULATOR
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG    \r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE KERNEL_EXTRA\r
+MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE KERNEL_EXTRA SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM\r
 # Additional\r

diff --git a/boards/mpc5554sim/build_config.mk b/boards/mpc5554sim/build_config.mk
index 1cea54c91b081f26f6a6c23f43e88469dd966e98..8375304bc0f5e66b7ea87ca047964b07af08cb7c 100644 (file)
--- a/boards/mpc5554sim/build_config.mk
+++ b/boards/mpc5554sim/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC BOOKE SPE E200Z6 MPC55XX MPC555X MPC5554 BRD_MPC5554SIM SIMULATOR
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG    \r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
+MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM\r
 # Additional\r

diff --git a/boards/mpc5567qrtech/build_config.mk b/boards/mpc5567qrtech/build_config.mk
index 5fea51eba2f5c9868c281e6a9ca539ad72384ba8..ecdceedd6934fac15de69725d99886c4f0a4bf93 100644 (file)
--- a/boards/mpc5567qrtech/build_config.mk
+++ b/boards/mpc5567qrtech/build_config.mk
@@ -15,7 +15,7 @@ CFG=PPC BOOKE E200Z6 MPC55XX MPC5567 BRD_MPC5567QRTECH SPE
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS  \r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
+MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE SCHM\r
 MOD_AVAIL+=LINIF LINSM LIN\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM\r

diff --git a/boards/mpc5604b_trk/build_config.mk b/boards/mpc5604b_trk/build_config.mk
index 7633036e65e3eb8f5010e61b0024ce09a22c3028..06f1e5d37c5b315e413cfa3e3a09228e3a5d7d5a 100644 (file)
--- a/boards/mpc5604b_trk/build_config.mk
+++ b/boards/mpc5604b_trk/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC E200Z0 MPC55XX MPC560X MPC560XB MPC5604B BRD_MPC5604B_TRK VLE
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP EA\r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP\r
+MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM LINSM\r
 # Additional\r

diff --git a/boards/mpc5604p_trk/build_config.mk b/boards/mpc5604p_trk/build_config.mk
index cc7767e5875fd2fffd9462c49cce5f24069e7c05..93a74fc33bb4c42822f2711f09370caa6750fdaa 100644 (file)
--- a/boards/mpc5604p_trk/build_config.mk
+++ b/boards/mpc5604p_trk/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC E200Z0 MPC55XX MPC560X MPC5604P BRD_MPC5604P_TRK VLE
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP EA\r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP\r
+MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM LINSM\r
 # Additional\r

diff --git a/boards/mpc5606b_xpc560b/build_config.mk b/boards/mpc5606b_xpc560b/build_config.mk
index 1315745c919d51a82fd8f159faffcce5303b791e..e34af61816d5df931c875e04a5d2da974ecb5236 100644 (file)
--- a/boards/mpc5606b_xpc560b/build_config.mk
+++ b/boards/mpc5606b_xpc560b/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC E200Z0 MPC55XX MPC560X MPC560XB MPC5606B BRD_MPC560X_XPC560B VLE
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP EA\r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP\r
+MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM LINSM\r
 # Additional\r

diff --git a/boards/mpc5606s_xpc560s/build_config.mk b/boards/mpc5606s_xpc560s/build_config.mk
index 6ff58e0a4ee3ecbd2bc8c23d344688fb6f4eaa2a..1b7812908ed56bd65ebce4e93a2119742cf0707c 100644 (file)
--- a/boards/mpc5606s_xpc560s/build_config.mk
+++ b/boards/mpc5606s_xpc560s/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC E200Z0 MPC55XX MPC560X MPC5606S BRD_MPC560X_XPC560S VLE
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP EA\r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP\r
+MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM LINSM\r
 # Additional\r

diff --git a/boards/mpc560xsim/build_config.mk b/boards/mpc560xsim/build_config.mk
index c857165157c415a85545e9d72cf39c82597f7fc0..a929dc8e4fcb7b2e616ef5f39b5849a2f1a3283a 100644 (file)
--- a/boards/mpc560xsim/build_config.mk
+++ b/boards/mpc560xsim/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC E200Z0 MPC55XX MPC560X MPC5606S BRD_MPC560X_XPC560S VLE SIMULATOR
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP EA\r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP\r
+MOD_AVAIL+=LINIF CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM LINSM\r
 # Additional\r

diff --git a/boards/mpc5668_gkit/build_config.mk b/boards/mpc5668_gkit/build_config.mk
index f6ef40b1cb8d2364f8de95dc11c219295dfba61c..72a1806c16d1f43dbb2dd686f80b2e4e9353d6d9 100644 (file)
--- a/boards/mpc5668_gkit/build_config.mk
+++ b/boards/mpc5668_gkit/build_config.mk
@@ -13,7 +13,7 @@ CFG=PPC BOOKE E200Z1 MPC55XX MPC5668 MPC5668G BRD_MPC5668_GKIT SPE
 # Memory + Peripherals\r
 MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP \r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
+MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM EA  \r
 # Additional\r

diff --git a/boards/stm32_mcbstm32/build_config.mk b/boards/stm32_mcbstm32/build_config.mk
index 83c81fc2d2ec54570d79bd19160d28fa34bb1f72..acd9d2ba9bbee1c5c40bb82868312f854aa97157 100644 (file)
--- a/boards/stm32_mcbstm32/build_config.mk
+++ b/boards/stm32_mcbstm32/build_config.mk
@@ -28,7 +28,7 @@ CFG+=STM32_MD
 # MCAL\r
 MOD_AVAIL+=ADC CAN DIO MCU FLS PORT PWM GPT WDG    \r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
+MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM\r
 # Additional\r

diff --git a/boards/stm32_stm3210c/build_config.mk b/boards/stm32_stm3210c/build_config.mk
index a14599dfb4d21183727d194dc78affb624f45e0b..a99d4bb58cda9881d26514a8bc564afb5fe2f88c 100644 (file)
--- a/boards/stm32_stm3210c/build_config.mk
+++ b/boards/stm32_stm3210c/build_config.mk
@@ -28,7 +28,7 @@ CFG+=STM32_CL
 # MCAL\r
 MOD_AVAIL+=ADC CAN DIO MCU FLS PORT PWM GPT   \r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
+MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM\r
 # Additional\r

diff --git a/boards/ti_tms570ls/build_config.mk b/boards/ti_tms570ls/build_config.mk
index 9d6c22f9a0702162aa53323d0c6361497a275459..32de2e3e644e22f8a3d6eb1e8e6efa2c14e8172a 100644 (file)
--- a/boards/ti_tms570ls/build_config.mk
+++ b/boards/ti_tms570ls/build_config.mk
@@ -28,7 +28,7 @@ CFG+=STM32_CL
 # MCAL\r
 MOD_AVAIL+=MCU CAN PORT DIO\r
 # System + Communication + Diagnostic\r
-MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE \r
+MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE SCHM\r
 # Network management\r
 MOD_AVAIL+=COMM NM CANNM CANSM\r
 # Additional\r

diff --git a/system/SchM/SchM.c b/system/SchM/SchM.c
index cc75e5c0d2694eee856b4eadae5ba2a906055f73..1c1e23c2d099a7a56a3be56b58d16f5d3cbeae7e 100644 (file)
--- a/system/SchM/SchM.c
+++ b/system/SchM/SchM.c
@@ -368,8 +368,6 @@ TASK(SchM_Startup){
 \r
        EcuM_RequestRUN(ECUM_USER_User_1);\r
 \r
-       ActivateTask(TASK_ID_Application);\r
-\r
        TerminateTask();\r
 \r
 }\r