Merge fixes

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

src/modules/commander/commander.cpp

@@ -2982,7 +2982,7 @@ set_control_mode()
 	/* set vehicle_control_mode according to set_navigation_state */
 	control_mode.flag_armed = armed.armed;
 	control_mode.flag_external_manual_override_ok = (!status.is_rotary_wing && !status.is_vtol);
-	//control_mode.flag_system_hil_enabled = status.hil_state == vehicle_status_s::HIL_STATE_ON;
+	control_mode.flag_system_hil_enabled = status.hil_state == vehicle_status_s::HIL_STATE_ON;
 	control_mode.flag_control_offboard_enabled = false;
 
 	switch (status.nav_state) {

src/modules/muorb/adsp/module.mk

@@ -41,11 +41,7 @@ ifeq ($(PX4_TARGET_OS),qurt)
 SRCS		= \
 		  px4muorb.cpp \
 		  uORBFastRpcChannel.cpp
-SRCS		=  param/param.c 
 endif
-endif
-
-SRCS		+= perf_counter.c \
 
 INCLUDE_DIRS	+= \
 		  ${PX4_BASE}/src/modules/uORB

src/modules/muorb/krait/CMakeLists.txt

@@ -30,9 +30,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-#if("${DSPAL_STUBS_ENABLE}" STREQUAL "1")
-#	include_directories(../krait-stubs)
-#endif()
 
 px4_add_module(
 	MODULE modules__muorb__krait