# HG changeset patch
# User paul
# Date 2017-07-07 09:31:41
# Node ID faa241919cf7e8a02340f01880988ba572e3e8e7
# Parent  61dabb2523bd9285f88b29b4f35792e1fe40a792
# Parent  c3bc6f763f5fcd8a7f42801cc51795ef0e7893f6

Merge

diff --git a/sparc/sparc-rtems.cmake b/sparc/sparc-rtems.cmake
--- a/sparc/sparc-rtems.cmake
+++ b/sparc/sparc-rtems.cmake
@@ -6,20 +6,19 @@ set(CMAKE_CXX_COMPILER ${rtems_dir}/bin/
 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> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+include_directories("${rtems_dir}/sparc-rtems/leon3/lib/include")
 
-set(CMAKE_C_LINK_EXECUTABLE  "<CMAKE_LINKER> <FLAGS> <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
-        )
+                       POST_BUILD
+                       COMMAND  ${rtems_dir}/bin/sparc-rtems-objdump -d ${bin}/${target} | ${CMAKE_SOURCE_DIR}/sparc/leon3ft-b2bst-scan.tcl
+                       )
 endfunction()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,14 +57,14 @@ option(FSW_debug_messages "Enable LFR de
 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_lpp_dpu_destid "Set to debug at LPP" ON)
 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 "15" CACHE STRING  "Choose N4 FSW Version." FORCE)
+set(SW_VERSION_N4 "14" CACHE STRING  "Choose N4 FSW Version." FORCE)
 
 if(FSW_verbose)
 	add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)