Remove libomxil-vc4 for RPI3 and Telephony BB from headed image

Change-Id: I3f7d8b7059811fa8fb786665abe83cd5a2189bdd

diff --git a/board/Config_rpi3.in b/board/Config_rpi3.in
index 45263173235cc6411d1d9a13975fbef60f4eaed3..e89afa2a7be6b10674f29c2aadf74ba6e478b4a4 100644 (file)
--- a/board/Config_rpi3.in
+++ b/board/Config_rpi3.in
@@ -42,7 +42,6 @@ config TBB_SET_MM_CONFIG_RPI3
        select TBB_ENABLE_MM_CONFIG
        select gst-omx if !TBB_INFO_PLATFORM_VERSION_6.0
        select mmfw-sysconf-target-rpi3
-       select libomxil-vc4
        help
                Enable the configuration of multimedia. openmx feature.
 
@@ -50,10 +49,6 @@ config mmfw-sysconf-target-rpi3
        bool
        depends on TBB_SET_MM_CONFIG_RPI3
 
-config libomxil-vc4
-       bool
-       depends on TBB_SET_MM_CONFIG_RPI3
-
 config TBB_ENABLE_RPI3_BLE
        bool "RPI3 Bluetooth BLE"
        select building-blocks-sub2-Preset_boards-RPI3-BLE

diff --git a/configs/tizen_headed_rpi_defconfig b/configs/tizen_headed_rpi_defconfig
index 3a21685ad08cb9e82d037dc5dc4e62e132bd1d38..0dc66890ad7542b1527a83d4824b8d98541cd644 100644 (file)
--- a/configs/tizen_headed_rpi_defconfig
+++ b/configs/tizen_headed_rpi_defconfig
@@ -55,7 +55,6 @@ building-blocks-sub2-Preset_boards-RPI3-Audio=y
 building-blocks-sub2-Preset_boards-RPI3-Audio_Recording=y
 TBB_SET_MM_CONFIG_RPI3=y
 mmfw-sysconf-target-rpi3=y
-libomxil-vc4=y
 TBB_RPI3_both_BREDR_and_BLE=y
 building-blocks-sub2-Preset_boards-RPI3-Bluetooth=y
 building-blocks-sub2-Preset_boards-RPI3-BLE=y
@@ -171,7 +170,6 @@ building-blocks-sub2-domain_API-Maps-Here_Plugin=y
 # Messaging API
 #
 building-blocks-sub2-domain_API-Messaging-Email=y
-building-blocks-sub2-domain_API-Messaging-Messages=y
 building-blocks-sub2-domain_API-Messaging-Push=y
 
 #

diff --git a/domain_csapi/Config_message.in b/domain_csapi/Config_message.in
index a57dfbaad0b9873763640688cae6b03f0b1a5fc2..3262f4f158cd67fcaa05d2cc7a4ef7cccf1eee10 100644 (file)
--- a/domain_csapi/Config_message.in
+++ b/domain_csapi/Config_message.in
@@ -2,7 +2,7 @@ menu "Messaging Group for TizenFX C#"
 config building-blocks-sub2-domain_CSAPI-Messaging-Email_Message
        bool "Tizen.Messaging"
        select building-blocks-sub2-domain_API-Messaging-Email
-       select building-blocks-sub2-domain_API-Messaging-Messages
+       select building-blocks-sub2-domain_API-Messaging-Messages if TBB_ENABLE_TELEPHONY
        depends on TBB_ENABLE_EFL
 #      depends on TBB_ENABLE_TELEPHONY
        help

diff --git a/support/scripts/mk_config_from_xml.sh b/support/scripts/mk_config_from_xml.sh
index 7b7db20981b1f705a4c2d6c6ccffdd66ac82c345..cd3646cb602d62b010d654c410bb9133cd889da0 100755 (executable)
--- a/support/scripts/mk_config_from_xml.sh
+++ b/support/scripts/mk_config_from_xml.sh
@@ -2,7 +2,7 @@
 
 LATEST_P_VER="6.0"
 
-EXCEPT_LIST="mmfw-sysconf-target-rpi3 libomxil-vc4 mmfw-sysconf-target-artik10 libomxil-e54xx nnstreamer-nnfw nnstreamer-ncsdk2 inference-engine-opencv inference-engine-tflite freealut libmm-display bluetooth-agent-hfp_ag bluetooth-agent-hfp_hf bluetooth-agent-hid bluetooth-agent-map bluetooth-agent-pbap bluetooth-frwk-plugin-headed org.tizen.bt-syspopup org.tizen.bt-syspopup-profile_common net-config-plugin-headed"
+EXCEPT_LIST="mmfw-sysconf-target-rpi3 mmfw-sysconf-target-artik10 libomxil-e54xx nnstreamer-nnfw nnstreamer-ncsdk2 inference-engine-opencv inference-engine-tflite freealut libmm-display bluetooth-agent-hfp_ag bluetooth-agent-hfp_hf bluetooth-agent-hid bluetooth-agent-map bluetooth-agent-pbap bluetooth-frwk-plugin-headed org.tizen.bt-syspopup org.tizen.bt-syspopup-profile_common net-config-plugin-headed"
 
 print_usage()
 {