diff --git a/bsp/fm3/mb9bf500r/fm3_easy_kit.ewp b/bsp/fm3/mb9bf500r/fm3_easy_kit.ewp
index 3d27059c06..b769dd1877 100644
--- a/bsp/fm3/mb9bf500r/fm3_easy_kit.ewp
+++ b/bsp/fm3/mb9bf500r/fm3_easy_kit.ewp
@@ -30,7 +30,7 @@
         <option>
           <name>Variant</name>
           <version>18</version>
-          <state>0</state>
+          <state>37</state>
         </option>
         <option>
           <name>GEndianMode</name>
@@ -99,7 +99,7 @@
         </option>
         <option>
           <name>OGChipSelectEditMenu</name>
-          <state>Default	None</state>
+          <state>MB9BF500R	Fujitsu MB9BF500R</state>
         </option>
         <option>
           <name>GenLowLevelInterface</name>
@@ -138,7 +138,7 @@
         <option>
           <name>GFPUCoreSlave</name>
           <version>18</version>
-          <state>0</state>
+          <state>37</state>
         </option>
         <option>
           <name>GBECoreSlave</name>
@@ -196,7 +196,7 @@
         </option>
         <option>
           <name>CCDiagSuppress</name>
-          <state></state>
+          <state>Pa050</state>
         </option>
         <option>
           <name>CCDiagRemark</name>
@@ -1742,6 +1742,9 @@
     <file>
       <name>$PROJ_DIR$\..\CMSIS\core_cm3.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\CMSIS\start_iar.S</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\CMSIS\system_mb9bf50x.c</name>
     </file>
@@ -1754,9 +1757,6 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m3\cpuport.c</name>
     </file>
-    <file>
-      <name>$PROJ_DIR$\..\CMSIS\start_iar.S</name>
-    </file>
   </group>
   <group>
     <name>Kernel</name>
diff --git a/bsp/fm3/mb9bf506r/fm3_easy_kit.ewp b/bsp/fm3/mb9bf506r/fm3_easy_kit.ewp
index 896852ed92..c0897412c9 100644
--- a/bsp/fm3/mb9bf506r/fm3_easy_kit.ewp
+++ b/bsp/fm3/mb9bf506r/fm3_easy_kit.ewp
@@ -196,7 +196,7 @@
         </option>
         <option>
           <name>CCDiagSuppress</name>
-          <state></state>
+          <state>Pa050</state>
         </option>
         <option>
           <name>CCDiagRemark</name>