Moving to RTEMS5.1, both on mainline and on RCC.

Demo_C_RTEMS/DeploymentView.aadl

@@ -41,12 +41,12 @@ SUBCOMPONENTS
     Taste::coordinates => "762 722 2102 1592";
     Deployment::Port_Number => 0;
   };
-  leon_rtems_posix : PROCESSOR ocarina_processors_leon::leon.rtems_posix {
+  leon3_rtems_posix : PROCESSOR ocarina_processors_leon::leon3.rtems51_posix {
     Taste::coordinates => "594 473 2269 1716";
   };
 PROPERTIES
   Taste::APLC_Binding => (reference (leon_partition)) APPLIES TO IV_Simple_C_Function;
-  Actual_Processor_Binding => (reference (leon_rtems_posix)) APPLIES TO leon_partition;
+  Actual_Processor_Binding => (reference (leon3_rtems_posix)) APPLIES TO leon_partition;
 END Node1.others;
 
 SYSTEM deploymentview

Demo_C_RTEMS_Gaisler/DeploymentView.aadl

@@ -41,7 +41,7 @@ SUBCOMPONENTS
     Taste::coordinates => "762 722 2102 1592";
     Deployment::Port_Number => 0;
   };
-  leon_rtems_posix : PROCESSOR ocarina_processors_leon::gr740.rtems410_gaisler_posix {
+  leon_rtems_posix : PROCESSOR ocarina_processors_leon::gr740.rcc13rc4_posix {
     Taste::coordinates => "594 473 2269 1716";
   };
 PROPERTIES

Demo_Eth_GR740_to_PC/DeploymentView.aadl

@@ -129,7 +129,7 @@ SUBCOMPONENTS
     Taste::coordinates => "154393 62725 186543 89579";
     Deployment::Port_Number => 0;
   };
-  gr740_rtems412_posix : PROCESSOR ocarina_processors_leon::gr740.rcc13rc4_posix {
+  gr740_rcc13rc4_posix : PROCESSOR ocarina_processors_leon::gr740.rcc13rc4_posix {
     Taste::coordinates => "150374 55053 190562 93415";
   };
   leon_ethernet_raw : DEVICE deploymentview::DV::Node2::leon_ethernet_raw.others {
@@ -139,8 +139,8 @@ CONNECTIONS
   leon_ethernet_raw_ip_i_link : BUS ACCESS leon_ethernet_raw_ip_i -> leon_ethernet_raw.link;
 PROPERTIES
   Taste::APLC_Binding => (reference (gr740_partition)) APPLIES TO IV_LivesInGR740;
-  Actual_Processor_Binding => (reference (gr740_rtems412_posix)) APPLIES TO gr740_partition;
-  Actual_Processor_Binding => (reference (gr740_rtems412_posix)) APPLIES TO leon_ethernet_raw;
+  Actual_Processor_Binding => (reference (gr740_rcc13rc4_posix)) APPLIES TO gr740_partition;
+  Actual_Processor_Binding => (reference (gr740_rcc13rc4_posix)) APPLIES TO leon_ethernet_raw;
 END Node2.others;
 
 SYSTEM deploymentview

Demo_ManyThreads/DeploymentView.aadl

@@ -45,7 +45,7 @@ SUBCOMPONENTS
     Taste::coordinates => "592 899 1728 1656";
     Deployment::Port_Number => 0;
   };
-  rtems_posix : PROCESSOR ocarina_processors_leon::leon.rtems_posix {
+  rtems_posix : PROCESSOR ocarina_processors_leon::leon3.rtems51_posix {
     Taste::coordinates => "450 683 1870 1764";
   };
 PROPERTIES

Demo_MessageOrdering/DeploymentView.aadl

@@ -45,13 +45,13 @@ SUBCOMPONENTS
     Taste::coordinates => "134427 102300 229315 152173";
     Deployment::Port_Number => 0;
   };
-  leon3_rtems412_posix : PROCESSOR ocarina_processors_leon::leon3.rtems412_posix {
+  leon3_rtems51_posix : PROCESSOR ocarina_processors_leon::leon3.rtems51_posix {
     Taste::coordinates => "122566 88051 241176 159298";
   };
 PROPERTIES
   Taste::APLC_Binding => (reference (leon3_partition)) APPLIES TO IV_F1;
   Taste::APLC_Binding => (reference (leon3_partition)) APPLIES TO IV_F2;
-  Actual_Processor_Binding => (reference (leon3_rtems412_posix)) APPLIES TO leon3_partition;
+  Actual_Processor_Binding => (reference (leon3_rtems51_posix)) APPLIES TO leon3_partition;
 END Node1.others;
 
 SYSTEM deploymentview

Demo_MultiPlatform/deploymentview.aadl

@@ -129,7 +129,7 @@ WITH ocarina_processors_x86;
            Deployment::Port_Number => 0;};
       pingee1_obj366 : SYSTEM interfaceview::IV::pingee1
         { Taste::Coordinates => "123 28 167 38" ;};
-      leoncpu_obj135 : PROCESSOR ocarina_processors_leon::leon.rtems_posix
+      leoncpu_obj135 : PROCESSOR ocarina_processors_leon::leon3.rtems51_posix
         { Taste::Coordinates => "113 14 178 46"; };
       ram_obj223 : MEMORY ram_obj223.others
         { Taste::Coordinates => "115 51 177 67"; };
@@ -209,7 +209,7 @@ WITH ocarina_processors_x86;
            Deployment::Port_Number => 0;};
       pingee2_obj377 : SYSTEM interfaceview::IV::pingee2
         { Taste::Coordinates => "216 25 266 36" ;};
-      leoncpu_obj146 : PROCESSOR ocarina_processors_leon::leon.rtems_posix
+      leoncpu_obj146 : PROCESSOR ocarina_processors_leon::leon3.rtems51_posix
         { Taste::Coordinates => "209 12 278 51"; };
       ram_obj234 : MEMORY ram_obj234.others
         { Taste::Coordinates => "209 53 277 70"; };

Demo_RTEMS_Ada/DeploymentView.aadl

@@ -41,7 +41,7 @@ SUBCOMPONENTS
     Taste::coordinates => "939 330 1459 670";
     Deployment::Port_Number => 0;
   };
-  leon_rtems_posix : PROCESSOR ocarina_processors_leon::leon.rtems_posix {
+  leon_rtems_posix : PROCESSOR ocarina_processors_leon::leon3.rtems51_posix {
     Taste::coordinates => "873 260 1573 705";
   };
 PROPERTIES

Demo_RTEMS_SDL/DeploymentView.aadl

@@ -45,13 +45,13 @@ SUBCOMPONENTS
     Taste::coordinates => "112791 80644 159958 108809";
     Deployment::Port_Number => 0;
   };
-  gr740_rtems412_posix : PROCESSOR ocarina_processors_leon::gr740.rtems412_posix {
+  gr740_rtems51_posix : PROCESSOR ocarina_processors_leon::gr740.rtems51_posix {
     Taste::coordinates => "106895 72597 165854 112832";
   };
 PROPERTIES
   Taste::APLC_Binding => (reference (gr740_partition)) APPLIES TO IV_SDL_Function;
   Taste::APLC_Binding => (reference (gr740_partition)) APPLIES TO IV_C_Function;
-  Actual_Processor_Binding => (reference (gr740_rtems412_posix)) APPLIES TO gr740_partition;
+  Actual_Processor_Binding => (reference (gr740_rtems51_posix)) APPLIES TO gr740_partition;
 END Node1.others;
 
 SYSTEM deploymentview

Demo_checkSMP/DeploymentView.aadl

@@ -53,7 +53,7 @@ SUBCOMPONENTS
     Taste::coordinates => "141020 107883 218669 153435";
     Deployment::Port_Number => 0;
   };
-  gr740_rtems412_posix : PROCESSOR ocarina_processors_leon::gr740.rtems412_posix {
+  gr740_rtems51_posix : PROCESSOR ocarina_processors_leon::gr740.rtems51_posix {
     Taste::coordinates => "131314 94868 228375 159942";
   };
 PROPERTIES
@@ -61,7 +61,7 @@ PROPERTIES
   Taste::APLC_Binding => (reference (gr740_partition)) APPLIES TO IV_Function2;
   Taste::APLC_Binding => (reference (gr740_partition)) APPLIES TO IV_Function3;
   Taste::APLC_Binding => (reference (gr740_partition)) APPLIES TO IV_Function4;
-  Actual_Processor_Binding => (reference (gr740_rtems412_posix)) APPLIES TO gr740_partition;
+  Actual_Processor_Binding => (reference (gr740_rtems51_posix)) APPLIES TO gr740_partition;
 END Node1.others;
 
 SYSTEM deploymentview

Demo_uPy_Basic_RTEMS412_Leon3/DeploymentView.aadl

@@ -41,12 +41,12 @@ SUBCOMPONENTS
     Taste::coordinates => "759 953 2273 1712";
     Deployment::Port_Number => 0;
   };
-  leon3_rtems412_posix : PROCESSOR ocarina_processors_leon::leon3.rtems412_posix {
+  leon3_rtems51_posix : PROCESSOR ocarina_processors_leon::leon3.rtems51_posix {
     Taste::coordinates => "570 736 2462 1820";
   };
 PROPERTIES
   Taste::APLC_Binding => (reference (leon3_partition)) APPLIES TO IV_my_function;
-  Actual_Processor_Binding => (reference (leon3_rtems412_posix)) APPLIES TO leon3_partition;
+  Actual_Processor_Binding => (reference (leon3_rtems51_posix)) APPLIES TO leon3_partition;
 END Node1.others;
 
 SYSTEM deploymentview