Arrange ARTIK BSP

Change-Id: I8e5c17c1aa541382aa3c3cffb9f96da1000c8fd1

diff --git a/board/Config.in b/board/Config.in
index 0cc449baa284852fde79a2522ede4efa33cada05..a16061e7ba63d3efbaa6368a7cfc45ff98cbb470 100644 (file)
--- a/board/Config.in
+++ b/board/Config.in
@@ -26,47 +26,58 @@ config building-blocks-sub1-Preset_boards-RPI3
 endchoice
 
 config TBB_ENABLE_MM_CONFIG
-bool
+       bool
+       default n
 
 config gst-omx
        bool
+       default n
        depends on TBB_SET_MM_CONFIG
 
 config TBB_ENABLE_AUDIO
-bool
+       bool
+       default n
 
 config TBB_ENABLE_BLUETOOTH
        bool
+       default n
        select building-blocks-sub2-domain_API-Network-Bluetooth_BREDR
 
 config TBB_ENABLE_BLE
        bool
+       default n
        select building-blocks-sub2-domain_API-Network-Bluetooth_LE
 
 config TBB_ENABLE_BLUETOOTH_AUDIO
        bool
+       default n
        select building-blocks-sub2-domain_API-Network-Bluetooth_Call_Audio
 
 config TBB_ENABLE_RECORDING
-bool
+       bool
+       default n
 
 config TBB_ENABLE_CAMERA
        bool
+       default n
        select building-blocks-sub2-domain_API-Multimedia-Camera
 
 config TBB_ENABLE_CODEC
        bool
+       default n
 
 config TBB_ENABLE_GPS
-       select building-blocks-sub2-domain_API-System-Feedback
-bool
+       bool
+       default n
 
 config TBB_ENABLE_HL_DISPLAY_SERVER
+       bool
+       default n
        select building-blocks-sub2-domain_API-UI-Display_Server_Headless
-bool
 
 config TBB_ENABLE_DISPLAY_SERVER
        bool
+       default n
        select building-blocks-sub2-domain_API-UI-Display_Server
        select building-blocks-sub2-domain_API-UI-FontConfig
        select building-blocks-sub2-domain_API-UI-Tizen_WS_Shell
@@ -74,43 +85,55 @@ config TBB_ENABLE_DISPLAY_SERVER
 
 config TBB_ENABLE_EFL
        bool
+       default n
        select building-blocks-sub2-domain_API-UI-EFL_NativeUIToolkit
 
 config TBB_ENABLE_TELEPHONY
-bool
+       bool
+       default n
 
 config TBB_ENABLE_WIFI
        bool
+       default n
        select building-blocks-sub2-domain_API-Network-WiFi_Manager
 
 config TBB_ENABLE_WIFI_DIRECT
        bool
+       default n
        select building-blocks-sub2-domain_API-Network-WiFi_Direct
 
 config TBB_ENABLE_NFC
-bool
+       bool
+       default n
 
 config TBB_ENABLE_DEVICED_PLUGIN
-bool
+       bool
+       default n
 
 config TBB_ENABLE_BATTERY
-bool
+       bool
+       default n
 
 config TBB_ENABLE_FEEDBACK
        bool
+       default n
        select building-blocks-sub2-domain_API-System-Feedback
 
 config TBB_ENABLE_IR
-bool
+       bool
+       default n
 
 config TBB_ENABLE_LED
-bool
+       bool
+       default n
 
 config TBB_ENABLE_SENSOR
-bool
+       bool
+       default n
 
 config TBB_ENABLE_USB_HOST
-bool
+       bool
+       default n
 
 config TBB_ENABLE_DALi
        bool
@@ -124,10 +147,12 @@ config TBB_ENABLE_DALi2
 
 
 config TBB_ENABLE_VULKAN
-bool
+       bool
+       default n
 
 config TBB_ENABLE_IM
        bool
+       default n
        select building-blocks-sub2-domain_API-UIX-Input_Method
 
 config TBB_ENABLE_HEADED
@@ -136,8 +161,9 @@ config TBB_ENABLE_HEADED
        default n if !(TBB_ENABLE_EFL && TBB_ENABLE_RECORDING &&  TBB_ENABLE_MM_CONFIG && TBB_ENABLE_BLUETOOTH && TBB_ENABLE_CAMERA && (TBB_ENABLE_DALi || TBB_ENABLE_DALi2) && TBB_ENABLE_IM)
 
 config TBB_ENABLE_ZIGBEE
-bool
-select building-blocks-sub2-domain_API-Network-ZigBee
+       bool
+       default n
+       select building-blocks-sub2-domain_API-Network-ZigBee
 
 if building-blocks-sub1-Preset_boards-ARTIK530
 source "board/Config_artik530.in"

diff --git a/board/Config_artik530.in b/board/Config_artik530.in
index 96117fab45c64c469fbb364cd01be48f3589966d..1a0e4e7dc6db2471978a82fd974c772e1616457e 100644 (file)
--- a/board/Config_artik530.in
+++ b/board/Config_artik530.in
@@ -36,7 +36,7 @@ config building-blocks-sub2-Preset_boards-ARTIK530-Audio_Recording
 config TBB_SET_MM_CONFIG_ARTIK530
        bool "ARTIK 530 Multimedia configuration"
        select TBB_ENABLE_MM_CONFIG
-       select gst-omx
+       select gst-omx if !TBB_INFO_PLATFORM_VERSION_6.0
        select mmfw-sysconf-target-artik10
        select libomxil-e54xx
        help
@@ -50,17 +50,40 @@ config libomxil-e54xx
        bool
        depends on TBB_SET_MM_CONFIG_ARTIK530
 
-config building-blocks-sub2-Preset_boards-ARTIK530-BLE
-       bool "ARTIK 530 BLE"
+choice
+prompt "Bluetooth Configuration"
+config TBB_ENABLE_ARTIK530_BLE
+       bool "ARTIK 530 Bluetooth BLE"
+       select building-blocks-sub2-Preset_boards-ARTIK530-BLE
+       select bluez-extension-le
        select TBB_ENABLE_BLE
        help
-               Packages of BLE HAL and Feature for ARTIK530
+               Only enabing BLE
 
-config building-blocks-sub2-Preset_boards-ARTIK530-Bluetooth
-       bool "ARTIK 530 Bluetooth"
+config TBB_ENABLE_ARTIK530_BLUETOOTH
+       bool "ARTIK Bluetooth BREDR"
+       select building-blocks-sub2-Preset_boards-ARTIK530-Bluetooth
+       select bluez-extension-bredr
+       select TBB_ENABLE_BLUETOOTH
+       help
+               Only enabing BREDR
+
+config TBB_ARTIK530_both_BREDR_and_BLEx
+       bool "ARTIK Bluetooth BREDR and BLE"
+       select building-blocks-sub2-Preset_boards-ARTIK530-Bluetooth
+       select building-blocks-sub2-Preset_boards-ARTIK530-BLE
        select TBB_ENABLE_BLUETOOTH
        help
-               Packages of Bluetooth HAL and Feature for ARTIK530
+               RPI3 Bluetooth BREDR and BLE
+endchoice
+
+config building-blocks-sub2-Preset_boards-ARTIK530-Bluetooth
+       bool
+       default n
+
+config building-blocks-sub2-Preset_boards-ARTIK530-BLE
+       bool
+       default n
 
 config building-blocks-sub2-Preset_boards-ARTIK530-Bluetooth_CallAudio
        bool "ARTIK 530 Bluetooth Call Audio"
@@ -69,7 +92,6 @@ config building-blocks-sub2-Preset_boards-ARTIK530-Bluetooth_CallAudio
        help
                Packages of Bluetooth Call Audio features for ARTIK530
 
-
 config building-blocks-sub2-Preset_boards-ARTIK530-Camera
        bool "ARTIK 530 Camera"
        select TBB_ENABLE_CAMERA
@@ -99,6 +121,13 @@ config building-blocks-sub2-Preset_boards-ARTIK530-DALi
        help
                Packages of DALi HAL and Feature for ARTIK530
 
+config building-blocks-sub2-Preset_boards-ARTIK530-DALi2
+       bool "ARTIK 530 DALi2"
+       select TBB_ENABLE_DALi2
+       depends on building-blocks-sub2-Preset_boards-ARTIK530-Display
+       help
+               Packages of DALi2 HAL and Feature for ARTIK530
+
 config building-blocks-sub2-Preset_boards-ARTIK530-EFL
        bool "ARTIK 530 EFL"
        select TBB_ENABLE_EFL

diff --git a/board/Config_rpi3.in b/board/Config_rpi3.in
index 189f80eab505da1358641ab2559080a96f27d2f7..fe3fa2555f2bf2bb69624a9e7853f05056f7d22a 100644 (file)
--- a/board/Config_rpi3.in
+++ b/board/Config_rpi3.in
@@ -52,21 +52,23 @@ config libomxil-vc4
 
 choice
 prompt "Bluetooth Configuration"
-config bluez-extension-le
+config TBB_ENABLE_RPI3_BLE
        bool "RPI3 Bluetooth BLE"
        select building-blocks-sub2-Preset_boards-RPI3-BLE
+       select bluez-extension-le
        select TBB_ENABLE_BLE
        help
                Only enabing BLE
 
-config bluez-extension-bredr
+config TBB_ENABLE_RPI3_BLUETOOTH
        bool "RPI3 Bluetooth BREDR"
        select building-blocks-sub2-Preset_boards-RPI3-Bluetooth
+       select bluez-extension-bredr
        select TBB_ENABLE_BLUETOOTH
        help
                Only enabing BREDR
 
-config TBB_both_BREDR_and_BLE
+config TBB_RPI3_both_BREDR_and_BLE
        bool "RPI3 Bluetooth BREDR and BLE"
        select building-blocks-sub2-Preset_boards-RPI3-Bluetooth
        select building-blocks-sub2-Preset_boards-RPI3-BLE

diff --git a/support/scripts/mk_config_from_xml.sh b/support/scripts/mk_config_from_xml.sh
index 71bfedfafe79714308b050480f87922675d5d975..c1a0ff17fb63b187e295b162b22269f90c2b79a5 100755 (executable)
--- a/support/scripts/mk_config_from_xml.sh
+++ b/support/scripts/mk_config_from_xml.sh
@@ -166,6 +166,7 @@ then
 
                echo "config $NAME" >> $OUTFILE
                echo "bool \"$NAME\"" >> $OUTFILE
+               echo "default n" >> $OUTFILE
                STATE="package_name_state"
        fi
        continue