HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r377:3236b2a1a6a0

Added srec production and bumped FSW to 3.2.0.17 since .16 has been delivered...

jeandet -

parent child

Context file:

r377:3236b2a1a6a0

sparc/sparc-rtems.cmake +7 0

             set(rtems_dir /opt/rtems-4.10/)
             set(CMAKE_SYSTEM_NAME rtems)
             set(CMAKE_C_COMPILER ${rtems_dir}/bin/sparc-rtems-gcc)
             set(CMAKE_CXX_COMPILER ${rtems_dir}/bin/sparc-rtems-g++)
             set(CMAKE_LINKER  ${rtems_dir}/bin/sparc-rtems-g++)
             SET(CMAKE_EXE_LINKER_FLAGS "-static")
             option(fix-b2bst "Activate -mfix-b2bst switch to mitigate \"LEON3FT Stale Cache Entry After Store with Data Tag Parity Error\" errata, GRLIB-TN-0009" ON)
             if(fix-b2bst)
                 set(CMAKE_C_FLAGS_RELEASE "-O3 -mfix-b2bst")
             else()
                 set(CMAKE_C_FLAGS_RELEASE "-O3")
             endif()
             set(CMAKE_C_LINK_EXECUTABLE  "<CMAKE_LINKER> <FLAGS> -Xlinker -Map=<TARGET>.map <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
             include_directories("${rtems_dir}/sparc-rtems/leon3/lib/include")
             function (check_b2bst target bin)
                 add_custom_command(TARGET ${target}
                     POST_BUILD
                     COMMAND  ${rtems_dir}/bin/sparc-rtems-objdump -d ${bin}/${target} | ${CMAKE_SOURCE_DIR}/sparc/leon3ft-b2bst-scan.tcl
                     )
             endfunction()
+            function (build_srec target bin rev)
+                add_custom_command(TARGET ${target}
+                    POST_BUILD
+                    COMMAND ${rtems_dir}/bin/sparc-rtems-objcopy -j .data -F srec ${bin}/${target} RpwLfrApp_XXXX_data_rev-${rev}.srec && ${rtems_dir}/bin/sparc-rtems-objcopy -j .text -F srec ${bin}/${target} RpwLfrApp_XXXX_text_rev-${rev}.srec
+                    )
+            endfunction()

src/CMakeLists.txt +6 -1

             cmake_minimum_required (VERSION 2.6)
             project (fsw)
             include(sparc-rtems)
             include(cppcheck)
             include_directories("../header"
             	 "../header/lfr_common_headers"
             	 "../header/processing"
                      "../LFR_basic-parameters"
                      "../src")
             set(SOURCES    wf_handler.c
                  tc_handler.c
                  fsw_misc.c
                  fsw_init.c
                  fsw_globals.c
                  fsw_spacewire.c
                  tc_load_dump_parameters.c
                  tm_lfr_tc_exe.c
                  tc_acceptance.c
                  processing/fsw_processing.c
                  processing/avf0_prc0.c
                  processing/avf1_prc1.c
                  processing/avf2_prc2.c
                  lfr_cpu_usage_report.c
                  ${LFR_BP_SRC}
                  ../header/wf_handler.h
                  ../header/tc_handler.h
                  ../header/grlib_regs.h
                  ../header/fsw_misc.h
                  ../header/fsw_init.h
                  ../header/fsw_spacewire.h
                  ../header/tc_load_dump_parameters.h
                  ../header/tm_lfr_tc_exe.h
                  ../header/tc_acceptance.h
                  ../header/processing/fsw_processing.h
                  ../header/processing/avf0_prc0.h
                  ../header/processing/avf1_prc1.h
                  ../header/processing/avf2_prc2.h
                  ../header/fsw_params_wf_handler.h
                  ../header/lfr_cpu_usage_report.h
                  ../header/lfr_common_headers/ccsds_types.h
                  ../header/lfr_common_headers/fsw_params.h
                  ../header/lfr_common_headers/fsw_params_nb_bytes.h
                  ../header/lfr_common_headers/fsw_params_processing.h
                  ../header/lfr_common_headers/tm_byte_positions.h
                  ../LFR_basic-parameters/basic_parameters.h
                  ../LFR_basic-parameters/basic_parameters_params.h
                  ../header/GscMemoryLPP.hpp
             )
             option(FSW_verbose "Enable verbose LFR" OFF)
             option(FSW_boot_messages "Enable LFR boot messages" OFF)
             option(FSW_debug_messages "Enable LFR debug messages" OFF)
             option(FSW_cpu_usage_report "Enable LFR cpu usage report" OFF)
             option(FSW_stack_report "Enable LFR stack report" OFF)
             option(FSW_vhdl_dev "?" OFF)
             option(FSW_lpp_dpu_destid "Set to debug at LPP" OFF)
             option(FSW_debug_watchdog "Enable debug watchdog" OFF)
             option(FSW_debug_tch "?" OFF)
             set(SW_VERSION_N1 "3" CACHE STRING  "Choose N1 FSW Version." FORCE)
             set(SW_VERSION_N2 "2" CACHE STRING  "Choose N2 FSW Version." FORCE)
             set(SW_VERSION_N3 "0" CACHE STRING  "Choose N3 FSW Version." FORCE)
-            set(SW_VERSION_N4 "16" CACHE STRING  "Choose N4 FSW Version." FORCE)
+            set(SW_VERSION_N4 "17" CACHE STRING  "Choose N4 FSW Version." FORCE)
             if(FSW_verbose)
             	add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
             endif()
             if(FSW_boot_messages)
             	add_definitions(-DBOOT_MESSAGES)
             endif()
             if(FSW_debug_messages)
             	add_definitions(-DDEBUG_MESSAGES)
             endif()
             if(FSW_cpu_usage_report)
             	add_definitions(-DPRINT_TASK_STATISTICS)
             endif()
             if(FSW_stack_report)
             	add_definitions(-DPRINT_STACK_REPORT)
             endif()
             if(FSW_vhdl_dev)
             	add_definitions(-DVHDL_DEV)
             endif()
             if(FSW_lpp_dpu_destid)
             	add_definitions(-DLPP_DPU_DESTID)
             endif()
             if(FSW_debug_watchdog)
             	add_definitions(-DDEBUG_WATCHDOG)
             endif()
             if(FSW_debug_tch)
             	add_definitions(-DDEBUG_TCH)
             endif()
             add_definitions(-DMSB_FIRST_TCH)
             add_definitions(-DSWVERSION=-1-0)
             add_definitions(-DSW_VERSION_N1=${SW_VERSION_N1})
             add_definitions(-DSW_VERSION_N2=${SW_VERSION_N2})
             add_definitions(-DSW_VERSION_N3=${SW_VERSION_N3})
             add_definitions(-DSW_VERSION_N4=${SW_VERSION_N4})
             add_executable(fsw ${SOURCES})
             if(fix-b2bst)
                 check_b2bst(fsw ${CMAKE_CURRENT_BINARY_DIR})
             endif()
+            if(NOT FSW_lpp_dpu_destid)
+                build_srec(fsw ${CMAKE_CURRENT_BINARY_DIR} "${SW_VERSION_N1}-${SW_VERSION_N2}-${SW_VERSION_N3}-${SW_VERSION_N4}")
+            endif()
             add_test_cppcheck(fsw STYLE UNUSED_FUNCTIONS POSSIBLE_ERROR MISSING_INCLUDE)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages