Merge branch 'ecp' of rsa-git:/sdk/emulator/qemu into ecp

diff --cc tizen/src/Makefile.tizen
index c2487b0df29230a9274e4ae617ae37b9c538e758,de368368e08343231a3bf2025ab4c3b28a290461..bc2f33e6a26e1a03b6d60d2e99fddc1ef871b742
--- 1/tizen/src/Makefile.tizen
--- 2/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@@ -107,12 -105,8 +107,12 @@@ endi
  obj-y += debug_ch.o
  
  # ecs
- obj-y += ecs_msg.o ecs.o ecs-json-streamer.o qmp_handler.o
+ obj-y += ecs_msg.o ecs.o ecs-json-streamer.o qmp_handler.o ecs_sensor.o
  
 +# ecs msg
 +obj-y += ecs.pb-c.o
 +
 +
  # maru hardware
  include $(SRC_PATH)/tizen/src/Makefile.tizen.$(TARGET_BASE_ARCH)
  

diff --cc tizen/src/ecs.c
Simple merge

diff --cc tizen/src/ecs.h
Simple merge

diff --cc tizen/src/hw/maru_device_ids.h
index deda8024d6132caf6d1fd0ebab68239bdf5d5069,3775a25444473ff3349c19a4b4c1de50733d641e..3775a25444473ff3349c19a4b4c1de50733d641e
mode 100644,100755..100644
--- 1/tizen/src/hw/maru_device_ids.h
--- 2/tizen/src/hw/maru_device_ids.h
+++ b/tizen/src/hw/maru_device_ids.h