Commit a7929d25 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Merge branch 'feature_buster' into CoRA-Zynq

parents 683c9ba0 8ebf6bc3
......@@ -61,7 +61,7 @@ subcomponents
@@TABLE'ALIGN_ON(":")@@
@_Thread_Names_@ : thread @_Thread_Names_@_Thread::@_Thread_Names_@.others;
@@END_TABLE@@
@@IF@@ @_In_Port_Names'Length_@ > 0 and @_VP_Platform_@ = PLATFORM_AIR @@-- Add poller thread to map AIR ports to POHIC ports
@@IF@@ @_In_Port_Names'Length_@ > 0 and (@_VP_Platform_@ = PLATFORM_AIR or @_VP_Platform_@ = PLATFORM_AIR_IOP) @@-- Add poller thread to map AIR ports to POHIC ports
Poll_Port : thread Port_Poller.i;
@@END_IF@@
@@IF@@ @_Thread_Src_Name'Length_@ > 0 or @_In_Port_Names'Length_@ > 0 or @_Out_Port_Names'Length_@ > 0
......
@@-- Specify the file name for a partition
@@-- @_Partition_Name_@ is available.
@@-- Don't specify anything if you don't want the file to be created
air.cgpr
@_Partition_Name_@_air.cgpr
......@@ -21,8 +21,12 @@
@@-- @_Thread_Dst_Name_@ : Vector tag : connection thread name (dest)
@@-- @_Thread_Src_Port_@ : Vector tag : connection port name (source)
@@-- @_Thread_Dst_Port_@ : Vector tag : connection port name (dest)
@@IF@@ @_VP_Platform_@ = PLATFORM_AIR_IOP
@@SET@@ Need_IOP = TRUE
@@END_IF@@
-- Node name : @_Name_@
-- Execution platform : @_CPU_Platform_@
-- VP Platform : @_VP_Platform_@
-- Generic gprbuild configuration file for rtems5 with Ada support for leon3
configuration project AIR is
package Compiler is
......@@ -31,6 +35,7 @@ configuration project AIR is
for Driver ("Ada") use "sparc-rtems5-gcc";
for Leading_Required_Switches ("C") use ("-c");
for Leading_Required_Switches ("C++") use ("-c");
for Required_Switches("Ada") use
("-c",
......@@ -45,10 +50,49 @@ configuration project AIR is
"-DRTEMS_POSIX",
"-DRTEMS412",
"-DGRLEON3",
"-DPMK_MAX_CORES=4",
"-ffunction-sections",
"-fdata-sections",
"-B/home/taste/tool-src/air/air/install/libs/libprintf/",
"-B/home/taste/tool-src/air/air/install/libs/libair/",
@@IF@@ @_Need_IOP_@
"-B/home/taste/tool-src/air/air/install/libs/libiop/",
"-B/home/taste/tool-src/air/air/install/pos/bare/",
"-I/home/taste/tool-src/air/air/install/libs/libiop/include/",
@@END_IF@@
"-I/home/taste/tool-src/air/air/install/pmk/bsp/sparc/leon3/include",
"-I/home/taste/tool-src/air/air/install/pmk/core/include",
"-I/home/taste/tool-src/air/air/install/pmk/arch/sparc/include",
"-DLEON_RTEMS",
"-DLEON3",
"-DGAISLER",
"-B/home/taste/tool-src/air/air/install/pos/rtems5/rtems5-install/sparc-rtems5/leon3/lib",
"-specs=bsp_specs",
"-qrtems",
"-mcpu=leon3");
for Required_Switches("C++") use
("--pipe",
"-DTARGET=air",
"-DAIR_HYPERVISOR",
"-DRTEMS_POSIX",
"-DRTEMS412",
"-DGRLEON3",
"-DPMK_MAX_CORES=4",
"-ffunction-sections",
"-fdata-sections",
"-fpermissive",
"-B/home/taste/tool-src/air/air/install/libs/libprintf/",
"-B/home/taste/tool-src/air/air/install/libs/libair/",
@@IF@@ @_Need_IOP_@
"-B/home/taste/tool-src/air/air/install/libs/libiop/",
"-B/home/taste/tool-src/air/air/install/pos/bare/",
"-I/home/taste/tool-src/air/air/install/libs/libiop/include/",
"-I/home/taste/tool-inst/share/SharedTypes/air_device/air_device/CPP/src",
@@END_IF@@
"-I/home/taste/tool-src/air/air/install/pmk/bsp/sparc/leon3/include",
"-I/home/taste/tool-src/air/air/install/pmk/core/include",
"-I/home/taste/tool-src/air/air/install/pmk/arch/sparc/include",
"-DLEON_RTEMS",
"-DLEON3",
"-DGAISLER",
......@@ -58,10 +102,13 @@ configuration project AIR is
"-mcpu=leon3");
for Object_File_Suffix ("C") use ".o";
for Object_File_Suffix ("C++") use ".o";
for Object_File_Suffix ("Ada") use ".o";
for Dependency_Switches ("C") use ("-Wp,-MD,");
for Dependency_Switches ("C++") use ("-Wp,-MD,");
for Dependency_Switches ("Ada") use ("-MMD","-MF","");
for Include_Switches ("C") use ("-I");
for Include_Switches ("C++") use ("-I");
for Include_Switches ("Ada") use ("-I");
for Include_Path ("Ada") use "ADA_INCLUDE_PATH";
for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE";
......@@ -86,6 +133,11 @@ configuration project AIR is
"-B/home/taste/tool-src/air/air/install/pos/rtems5/rtems5-install/sparc-rtems5/leon3/lib",
"-B/home/taste/tool-src/air/air/install/libs/libprintf/",
"-B/home/taste/tool-src/air/air/install/libs/libair/",
@@IF@@ @_Need_IOP_@
"-B/home/taste/tool-src/air/air/install/libs/libiop/",
"-B/home/taste/tool-src/air/air/install/pos/bare/",
"-L/home/taste/tool-inst/share/SharedTypes/air_device/air_device/CPP/src",
@@END_IF@@
"-specs=bsp_specs",
"-qrtems",
"-lm",
......@@ -102,9 +154,15 @@ configuration project AIR is
"-lrtemsbsp",
"/home/taste/tool-src/air/air/install/libs/libprintf/libprintf.a",
"/home/taste/tool-src/air/air/install/libs/libair/libair.a",
@@IF@@ @_Need_IOP_@
"/home/taste/tool-src/air/air/install/libs/libiop/libiop.a",
"/home/taste/tool-src/air/air/install/pos/bare/bare.a",
"/home/taste/tool-src/air/air/install/pmk/pmk.a",
@@END_IF@@
"/home/taste/tool-src/air/air/install/libs/imaspex/imaspex.a",
"-Wl,--end-group",
"-mcpu=leon3");
for Default_Switches ("Ada") use
("--pipe",
"-g",
......
......@@ -6,6 +6,6 @@
@@-- Use_POHIC
@@-- Debug
@@-- No_Stdlib
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ = PLATFORM_AIR and @_Target_@ /= SIMU
@@IF@@ @_Use_POHIC_@ and (@_CPU_Platform_@ = PLATFORM_AIR or @_CPU_Platform_@ = PLATFORM_AIR_IOP) and @_Target_@ /= SIMU
TRUE
@@END_IF@@
......@@ -29,12 +29,16 @@
@@-- @_Out_Port_Type_Name_@ : |_ corresponding parameter type name (optional)
-- Node name : @_Name_@
-- Execution platform : @_CPU_Platform_@
-- VP Platform : @_VP_Platform_@
@@-- Not all systems use Ada so we must not always include Ada dataview folder
@@TABLE@@
@@IF@@ @_LOWER:Block_Languages_@ = sdl or @_LOWER:Block_Languages_@ = ada
@@SET@@ Need_Ada = TRUE
@@END_IF@@
@@END_TABLE@@
@@IF@@ @_VP_Platform_@ = PLATFORM_AIR_IOP
@@SET@@ Need_IOP = TRUE
@@END_IF@@
project @_CAPITALIZE:Name_@_AIR is
type Build_Type is ("Debug", "Release");
......@@ -64,18 +68,32 @@ project @_CAPITALIZE:Name_@_AIR is
--"-fdata-sections",
"-Wmissing-prototypes",
"-Wimplicit-function-declaration",
"-Wstrict-prototypes",
"-Wnested-externs");
"-Wstrict-prototypes");
Common_Cpp_Switches :=
("-Wall",
"-Wextra",
"-g",
"-fdiagnostics-show-option",
"-Wcast-align",
"-Wswitch");
case Build is
when "Release" =>
for Default_Switches ("C") use Common_C_Switches & ("-O2", "-DNDEBUG")
& external_as_list("@_UPPER:Name_@_USER_CFLAGS", " ")
& external_as_list("USER_CFLAGS", " ");
for Default_Switches ("C++") use Common_Cpp_Switches & ("-O2", "-DNDEBUG")
& external_as_list("@_UPPER:Name_@_USER_CFLAGS", " ")
& external_as_list("USER_CFLAGS", " ");
when "Debug" =>
for Default_Switches ("C") use Common_C_Switches & ("-D__PO_HI_USE_VCD=1")
& external_as_list("@_UPPER:Name_@_USER_CFLAGS", " ")
& external_as_list("USER_CFLAGS", " ");
for Default_Switches ("C++") use Common_Cpp_Switches & ("-D__PO_HI_USE_VCD=1")
& external_as_list("@_UPPER:Name_@_USER_CFLAGS", " ")
& external_as_list("USER_CFLAGS", " ");
end case;
end Compiler;
......@@ -83,6 +101,9 @@ project @_CAPITALIZE:Name_@_AIR is
for Default_Switches ("C") use
external_as_list("@_UPPER:Name_@_USER_LDFLAGS", " ")
& external_as_list("USER_LDFLAGS", " ");
for Default_Switches ("C++") use
external_as_list("@_UPPER:Name_@_USER_LDFLAGS", " ")
& external_as_list("USER_LDFLAGS", " ");
end Linker;
package Builder is
......@@ -114,6 +135,9 @@ project @_CAPITALIZE:Name_@_AIR is
"../../@_LOWER:Block_Names_@/@_Block_Languages_@/wrappers",
@@END_IF@@
@@END_TABLE@@
@@IF@@ @_Need_IOP_@ = TRUE
"/home/taste/tool-inst/share/SharedTypes/air_device/air_device/CPP/src",
@@END_IF@@
"../deploymentview_final/@_LOWER:Name_@")
& external_as_list("EXTERNAL_SOURCE_PATH", ":")
& external_as_list("@_UPPER:Name_@_EXTERNAL_SOURCE_PATH", ":")
......
......@@ -6,6 +6,6 @@
@@-- Use_POHIC
@@-- Debug
@@-- No_Stdlib
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ = PLATFORM_AIR and @_Target_@ /= SIMU
@@IF@@ @_Use_POHIC_@ and (@_CPU_Platform_@ = PLATFORM_AIR or @_CPU_Platform_@ = PLATFORM_AIR_IOP) and @_Target_@ /= SIMU
TRUE
@@END_IF@@
......@@ -6,6 +6,7 @@
@@-- Use_POHIC
@@-- Debug
@@-- No_Stdlib
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ = PLATFORM_AIR and @_Target_@ /= SIMU
<<<<<<< HEAD
@@IF@@ @_Use_POHIC_@ and (@_CPU_Platform_@ = PLATFORM_AIR or @_CPU_Platform_@ = PLATFORM_AIR_IOP) and @_Target_@ /= SIMU
TRUE
@@END_IF@@
......@@ -21,7 +21,7 @@
@@-- @_Thread_Dst_Name_@ : Vector tag : connection thread name (dest)
@@-- @_Thread_Src_Port_@ : Vector tag : connection port name (source)
@@-- @_Thread_Dst_Port_@ : Vector tag : connection port name (dest)
@@IF@@ @_VP_Platform_@ = PLATFORM_AIR
@@IF@@ @_VP_Platform_@ = PLATFORM_AIR or @_VP_Platform_@ = PLATFORM_AIR_IOP
/* This file was generated by TASTE to support the AIR to POHIC Ports mapping,
allowing inter-partition communication.
*/
......
......@@ -6,6 +6,6 @@
@@-- Use_POHIC
@@-- Debug
@@-- No_Stdlib
@@IF@@ @_Use_POHIC_@ and @_CPU_Platform_@ = PLATFORM_AIR and @_Target_@ /= SIMU
@@IF@@ @_Use_POHIC_@ and (@_CPU_Platform_@ = PLATFORM_AIR or @_CPU_Platform_@ = PLATFORM_AIR_IOP) and @_Target_@ /= SIMU
TRUE
@@END_IF@@
......@@ -44,14 +44,20 @@ release:
gprbuild -p --config=rtems_ada.cgpr -P @_LOWER:Partition_Names_@_rtems_ada.gpr -XCFG="Release" -cargs:C -DSTATIC=""
@@END_TABLE@@
@@ELSIF@@ @_CPU_Platform_@ = PLATFORM_AIR
@@ELSIF@@ @_CPU_Platform_@ = PLATFORM_AIR or @_CPU_Platform_@ = PLATFORM_AIR_IOP
debug:
@@TABLE@@
# We need to compile and link separately because the linker script must
# be copied to the obj folder. Path cannot be set manually with -T
gprbuild -c -p --config=air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
gprbuild -c -p -v --config=@_LOWER:Partition_Names_@_air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
cp ../deploymentview_final/@_LOWER:Partition_Names_@/linkcmds.inc @_LOWER:Partition_Names_@_obj/
gprbuild -l -v -p --config=air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
gprbuild -l -p -v --config=@_LOWER:Partition_Names_@_air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
@@END_TABLE@@
release:
@@TABLE@@
gprbuild -c -p --config=@_LOWER:Partition_Names_@_air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Release" -cargs:C -DSTATIC=""
cp ../deploymentview_final/@_LOWER:Partition_Names_@/linkcmds.inc @_LOWER:Partition_Names_@_obj/
gprbuild -l -p --config=air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Release" -cargs:C -DSTATIC=""
@@END_TABLE@@
@@ELSIF@@ @_CPU_Platform_@ = PLATFORM_ZYNQZC706
......
DISABLED_TESTS=common/ shared-components/ logs/
export EXPECTED_FAILURES=test-stm32 air-iop1 stm32-serial-pohiada2 test-air-portnames stm32-f407-serial-pohi test-air-multiports test-air-interpartcomm stm32-f407-serial test-air-2cyclics stm32-f407-encodeReal TrafficLight_stm32f407_NonDistrib TrafficLight_stm32f407 msp430_cyclic_calls_protected msp430_cyclic_calls_sporadic msp430_cyclic_calls_unprotected msp430_protected_calls_protected msp430_protected_calls_sporadic msp430_protected_calls_unprotected msp430_sporadic_calls_protected msp430_sporadic_calls_sporadic msp430_sporadic_calls_unprotected msp430_unprotected_calls_protected msp430_unprotected_calls_sporadic msp430_unprotected_calls_unprotected Demo_Database Demo_ContextParams
export EXPECTED_FAILURES=test-stm32 air-iop1 stm32-serial-pohiada2 test-air-portnames stm32-f407-serial-pohi test-air-multiports test-air-interpartcomm stm32-f407-serial test-air-2cyclics stm32-f407-encodeReal TrafficLight_stm32f407_NonDistrib TrafficLight_stm32f407 msp430_cyclic_calls_protected msp430_cyclic_calls_sporadic msp430_cyclic_calls_unprotected msp430_protected_calls_protected msp430_protected_calls_sporadic msp430_protected_calls_unprotected msp430_sporadic_calls_protected msp430_sporadic_calls_sporadic msp430_sporadic_calls_unprotected msp430_unprotected_calls_protected msp430_unprotected_calls_sporadic msp430_unprotected_calls_unprotected msp430_ada msp430_cpp msp430_driver_e_usci_serial msp430_sdl_ada msp430_sdl_c
TEST_CASES=$(sort $(filter-out $(DISABLED_TESTS), $(dir $(wildcard */))))
export MAKEFLAGS="-j $(grep -c ^processor /proc/cpuinfo)"
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment