Commit cffcd1c4 authored by Laura Alexandra Sequeira Gouveia's avatar Laura Alexandra Sequeira Gouveia
Browse files

Zynq7000: proper rebuild process for HW.

parent 564b1954
Pipeline #1898 failed with stage
in 8 minutes and 31 seconds
......@@ -42,19 +42,24 @@ air:
gprbuild -l -p -v --config=air.cgpr -P @_LOWER:Partition_Names_@_air.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
@@END_TABLE@@
ifeq ($(NO_BITFILE), 1)
zynq:
else
zynq: zynq_bitfilegen
endif
@@TABLE@@
gprbuild -p -v --config=zynq_rtems.cgpr -P @_LOWER:Partition_Names_@_zynq.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
gprbuild -p -v --config=zynq_rtems.cgpr -P @_LOWER:Partition_Names_@_zynq_rtems.gpr -XCFG="Debug" -cargs:C -DSTATIC="static"
@@END_TABLE@@
make -f Makefile.bambu
zynq_bitfilegen:
@@TABLE@@
gprbuild -p -v --config=zynq_rtems.cgpr -P @_LOWER:Partition_Names_@_zynq_rtems.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
gprbuild -p -v --config=zynq_rtems.cgpr -P @_LOWER:Partition_Names_@_zynq.gpr -XCFG="Debug" -cargs:C -DSTATIC="static"
@@END_TABLE@@
make -f Makefile.bambu
zynq_qemu:
@@TABLE@@
gprbuild -p -v --config=zynq_rtems_qemu.cgpr -P @_LOWER:Partition_Names_@_zynq_rtems_qemu.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
gprbuild -p -v --config=zynq_rtems_qemu.cgpr -P @_LOWER:Partition_Names_@_zynq_rtems_qemu.gpr -XCFG="Debug" -cargs:C -DSTATIC="static"
@@END_TABLE@@
release_native:
......
......@@ -19,7 +19,7 @@ project @_CAPITALIZE:Name_@_Zynq_Bambu is
-- for Create_Missing_Dirs use "True"; (not supported in Debian 9, use -p instead)
for Object_Dir use "Bambu";
for Exec_Dir use "../../binaries";
for Exec_Dir use "Bambu";
for Languages use ("FPGA");
package Compiler is
......@@ -45,8 +45,7 @@ project @_CAPITALIZE:Name_@_Zynq_Bambu is
"--reset-name=reset_@_STRIP:Unprotected_PIs_@",
"--start-name=start_@_STRIP:Unprotected_PIs_@",
"--done-name=finish_@_STRIP:Unprotected_PIs_@",
"--top-fname=bambu_@_STRIP:Unprotected_PIs_@",
"../../../@_LOWER:Name_@/@_Language_@/wrappers/@_STRIP:Unprotected_PIs_@_bambu.c");
"--top-fname=@_STRIP:Unprotected_PIs_@_bambu");
case Build is
......@@ -62,14 +61,13 @@ project @_CAPITALIZE:Name_@_Zynq_Bambu is
-- following to be updated with all relevant source dirs
for Source_Dirs use
(
"../../@_LOWER:Name_@/@_Language_@/src"
"../../@_LOWER:Name_@/@_Language_@/wrappers"
);
for Source_Files use ("@_STRIP:Unprotected_PIs_@_bambu.c");
for Excluded_Source_Files use
(
@@IF@@ @_LOWER:Language_@ = simulink
"ert_main.c"
@@END_IF@@
);
......
Generate a gpr configuration file for RTEMS with Ada support (POHIC)
@@-- The following tags are available in this template:
@@--
@@-- @_Name_@ : Protected block name
@@-- @_Language_@ : Implementation language
@@-- @_Calling_Threads_@ : List of calling threads
@@-- @_Node name_@ : Node name
@@-- @_Protected_PIs_@ : Protected Provided interfaces (from pi.tmplt)
@@-- @_Unprotected_PIs_@ : Unprotected Provided interfaces (from pi.tmplt)
@@-- @_Required_@ : Required interfaces (from ri.tmplt)
@@-- @_Property_Names_@ : List of User-defined properties (names)
@@-- @_Property_Values_@ |_ Vector Tag: List of User-defined properties (values)
@@IF@@ @_LOWER:Language_@ = simulink or @_LOWER:Language_@ = c
@@TABLE@@
@@IF@@ @_LOWER:Property_Names_@ = taste_iv_properties::fpga_configurations and not @_IS_EMPTY:LOWER:Property_Values_@
@_Property_Values_@
@@END_IF@@
@@END_TABLE@@
@@END_IF@@
@@-- Specify the file name for a protected block
@@-- @_Block_Name_@ is available.
@@-- Don't specify anything if you don't want the file to be created
@@-- The following tags are available in this template:
@@--
@@-- @_Node_Name_@ : Name of the node as defined in the Deployment View
@@-- The content of this file is generated from node.tmplt
@@-- If there is no string defined here, no file will be generated per node,
@@-- (that's an option if the intent is to generate only one file per system)
@@-- 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
@_LOWER:Partition_Name_@_bitfiles.h
@@-- Specify the file name for the complete system (including nodes)
@@-- (no template tag)
@@-- Specify the file name for a thread
@@-- @_Thread_Name_@ is available.
@@-- Don't specify anything if you don't want the file to be created
@@-- The following tags are available in this template:
@@--
@@-- @_Node_Name_@ : Name of the node from deployment view
@@-- @_Partition_Names_@ : Tag listing the partitions in this node
@@-- @_Partitions_@ : List of rendered code for partitions
@@-- @_CPU_Name_@, _Platform_@, _Classifier_@, _Ada_Runtime_@ : Info about CPU
@@-- The following tags are available in this template:
@@--
@@-- @_Name_@ : Partition name (usually the name of the binary)
@@-- @_Threads_@ : Code generated for the threads
@@-- @_Thread_Names_@ : Tag: list of thread names
@@-- @_Node_Name_@ : Name of the node containing this partition
@@-- @_Blocks_@ : Code generated for protected functions
@@-- @_Block_Names@ : Vector Tag: list of block (user functions) names
@@-- @_Block_Languages_@ : |_ Corresponding implementation language
@@-- @_Block_FPGAConf_@ : |_ Corresponding FPGA Configuration property value
@@-- @_Coverage_@ : True if user requested code coverage enable
@@-- @_Package_Name_@ : AADL Package name for the target (e.g. ocarina_porocessors_x86)
@@-- @_CPU_Name_@ : CPU Name (e.g. x86_linux)
@@-- @_CPU_Platform_@ : AADL CPU_Platform (e.g. PLATFORM_NATIVE)
@@-- @_CPU_Classifier_@ : AADL CPU Classifier (e.g. ocarina_processors_x86::x86.linux)
@@-- @_CPU_Family_@ : e.g. gr740 or x86
@@-- @_CPU_Instance_@ : e.g. rtems51_posix or linux
@@-- @_VP_Name_@ : Virtual processor name on which the partition is bounded
@@-- @_VP_Platform_@ : Virtual processor platform (e.g. PLATFORM_AIR)
@@-- @_VP_Classifier_@ : Virtual processor classifier
@@-- @_Ada_Runtime_@ : Set if CPU_Platform = PLATFORM_GNAT_RUNTIME
@@-- @_Bound_Functions_@ : List of user functions from Interface view
@@-- @_Thread_Src_Name_@ : Vector tag : connection thread name (source)
@@-- @_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)
@@-- @_In_Port_Names_@ : Vector tag: input ports of the partition
@@-- @_In_Port_Thread_Name_@ : |_ corresponding thread inside the partition
@@-- @_In_Port_Type_Name_@ : |_ corresponding parameter type name (optional)
@@-- @_Out_Port_Names_@ : Vector tag: output ports of the partition
@@-- @_Out_Port_Thread_Name_@ : |_ corresponding thread inside the partition
@@-- @_Out_Port_Type_Name_@ : |_ corresponding parameter type name (optional)
struct config_bitfile {
char *config;
char *global_status_var;
int offset;
int size;
};
@@TABLE@@
@@IF@@ not @_IS_EMPTY:Block_FPGAConf_@
extern char globalFpgaStatus_@_LOWER:Block_Names_@[20];
@@END_IF@@
@@END_TABLE@@
struct config_bitfile bitfiles[] = {
@@INLINE(,\n)@@
@@TABLE@@
@@IF@@ not @_IS_EMPTY:Block_FPGAConf_@
"@_Block_FPGAConf_@", globalFpgaStatus_@_LOWER:Block_Names_@, OFFSET_@_UPPER:Block_Names_@, SIZE_@_UPPER:Block_Names_@
@@END_IF@@
@@END_TABLE@@
@@END_INLINE@@
};
@@-- The following tags are available in this template:
@@--
@@-- @_Name_@ : The name of the interface
@@-- @_Direction_@ : "PI" or "RI"
@@-- @_Kind_@ : The RCM Kind
@@-- @_Parent_Function_@ : The name of the function
@@-- @_Param_Names_@ : List of parameter names
@@-- @_Param_Types_@ : |_ Corresponding parameter types
@@-- @_Param_Directions_@ : |_ Corresponding direction
@_STRIP:Name_@
@@-- The following tags are available in this template:
@@--
@@-- @_Name_@ : The name of the interface
@@-- @_Direction_@ : "PI" or "RI"
@@-- @_Kind_@ : The RCM Kind
@@-- @_Parent_Function_@ : The name of the function
@@-- @_Param_Names_@ : List of parameter names
@@-- @_Param_Types_@ : |_ Corresponding parameter types
@@-- @_Param_Directions_@ : |_ Corresponding direction
@@-- The following tags are available in this template:
@@--
@@-- @_Nodes_@ : Code generated for the nodes
@@-- @_Node_Names_@ : Vector Tag of node names
@@-- @_Node_CPU_@ : |_ Corresponding CPU name (eg x86_linux)
@@-- @_Node_CPU_Classifier_@ : |_ CPU Classifier (ocarina...::x86_linux)
@@-- @_Partition_Names_@ : Vector Tag of partition names
@@-- @_Partition_Node_@ : |_ Corresponding node name
@@-- @_Partition_CPU_@ : |_ Corresponding CPU name
@@-- @_Threads_@ : Code generated for the threads
@@-- @_Thread_Names_@ : List of all threads in the complete system
@@-- @_Target_Packages_@ : List of all target package names in the complete system
@@-- And all the system configuration obtained from the command line:
@@-- Interface_View, Deployment_View, Data_View, Binary_Path, Check_Data_View,
@@-- Output_Dir, Skeletons, Glue, Use_POHIC, Timer_Resolution, Debug_Flag,
@@-- No_Stdlib_Flag, Timer_Resolution, Other_Files (list of aadl files)
@@-- The following tags are available in this template:
@@--
@@-- @_Thread_Name_@ : Thread name
@@-- @_Entry_Port_Name_@ : Name of the PI
@@-- @_RCM_@ : One of "CYCLIC_OPERATION", "SPORADIC_OPERATION"
@@-- @_Pro_Block_Name_@ : Name of the protected function
@@-- @_Node_Name_@ : Name of the deployment node
@@-- @_Remote_Threads_@ : Vector tag: output remote thread list
@@-- @_RI_Port_Name_@ : |_ Corresponding local RI name
@@-- @_Remote_PIs_@ : |_ Associated PI Name
@@-- @_Remote_PI_Sorts_@ : |_ Optional param type of the remote thread
@@-- @_Remote_PI_Modules_@ : |_ Asn1 module of the optional param type
@@-- Tags related to the PI that is at the origin of the thread creation:
@@-- @_Name_@, @_Kind_@, @_Parent_Function_@ : shoud be useless here
@@-- @_Param_Names_@, _Types_@, _ASN1_Modules, _Encodings_@, _Directions_@ : param vector tag
@@-- @_Period_@, @_WCET_@, @_Queue_Size_@ : relevant here
@@-- @_IF_Property_Names_@, _Values_@ : user properties (vector tag)
@@--
@@-- Matrix of output ports: Remote thread/corresponding remote PI @_Name_@
@@-- The following boolean tags are available to decide if the file
@@-- shall be generated or not:
@@-- Filename_Is_Present
@@-- Skeletons
@@-- Glue
@@-- Use_POHIC
@@-- Debug
@@-- No_Stdlib
@_Use_POHIC_@
......@@ -13,8 +13,8 @@
@@TABLE@@
@@IF@@ @_LOWER:Property_Names_@ = taste_iv_properties::fpga_configurations and not @_IS_EMPTY:LOWER:Property_Values_@
@_LOWER:Name_@:
cp Bambu/bambu_@_STRIP:Unprotected_PIs_@.vhd ../../@_LOWER:Name_@/@_Language_@/wrappers/TASTE-VHDL-DESIGN/ip/src
find Bambu -name \*.mem -exec cp {} ../../@_LOWER:Name_@/@_Language_@/wrappers/TASTE-VHDL-DESIGN/ip/src \;
cp -u Bambu/@_STRIP:Unprotected_PIs_@_bambu.vhd ../../@_LOWER:Name_@/@_Language_@/wrappers/TASTE-VHDL-DESIGN/ip/src
find Bambu -name \*.mem -exec cp -u {} ../../@_LOWER:Name_@/@_Language_@/wrappers/TASTE-VHDL-DESIGN/ip/src \;
make -C ../../@_LOWER:Name_@/@_Language_@/wrappers/TASTE-VHDL-DESIGN/project
@@END_IF@@
......
......@@ -69,6 +69,7 @@ configuration project ZYNQ_RTEMS is
for Object_File_Suffix ("C") use ".o";
for Object_File_Suffix ("C++") use ".o";
for Object_File_Suffix ("Ada") use ".o";
for Object_File_Suffix ("FPGA") use ".vhd";
for Dependency_Switches ("C") use ("-Wp,-MD,");
for Dependency_Switches ("C++") use ("-Wp,-MD,");
for Dependency_Switches ("Ada") use ("-MMD","-MF","");
......
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