[dcd] Revert some configfs changes & add nfcd-binder-plugin

Author: JamiKettunen

patterns/jolla-configuration-cheeseburger.yaml

@@ -1,14 +1,10 @@
-# Feel free to disable non-critical HA parts during devel by commenting lines out
-# Generated in hadk by executing: rpm/dhd/helpers/add_new_device.sh
-
 Description: Pattern with packages for cheeseburger configurations
 Name: jolla-configuration-cheeseburger
 Requires:
 - pattern:jolla-hw-adaptation-cheeseburger
 
 - patterns-sailfish-applications
 - patterns-sailfish-ui
-# For devices with cellular modem. Those without one, please comment out:
 - patterns-sailfish-cellular-apps
 # Early stages of porting benefit from these:
 - pattern:sailfish-porter-tools
@@ -37,4 +33,4 @@ Requires:
 # to improve camera startup times and the like
 - mapplauncherd-booster-silica-qt5-media
 
-Summary: Jolla Configuration cheeseburger
+Summary: Jolla Configuration cheeseburger

patterns/jolla-hw-adaptation-cheeseburger.yaml

@@ -1,6 +1,3 @@
-# Feel free to disable non-critical HA parts during devel by commenting lines out
-# Generated in hadk by executing: rpm/dhd/helpers/add_new_device.sh
-
 Description: Pattern with packages for cheeseburger HW Adaptation
 Name: jolla-hw-adaptation-cheeseburger
 Requires:
@@ -13,7 +10,6 @@ Requires:
 - droid-config-cheeseburger-preinit-plugin
 - droid-config-cheeseburger-flashing
 - droid-config-cheeseburger-bluez5
-#- droid-hal-cheeseburger-detritus
 - droid-hal-version-cheeseburger
 
 # Hybris packages
@@ -28,6 +24,7 @@ Requires:
 - bluebinder
 
 # NFC
+- nfcd-binder-plugin
 - jolla-settings-system-nfc
 
 # Flashlight
@@ -39,11 +36,11 @@ Requires:
 # Vibra
 - ngfd-plugin-native-vibrator
 - qt5-feedback-haptics-native-vibrator
-# - qt5-feedback-haptics-ffmemless
 
 # Needed for /dev/touchscreen symlink
 - qt5-plugin-generic-evdev
 
+# Audio
 - pulseaudio-modules-droid
 - pulseaudio-modules-droid-hidl
 - pulseaudio-modules-droid-glue
@@ -57,19 +54,21 @@ Requires:
 
 # Add GStreamer v1.0 as standard
 - gstreamer1.0
+- gstreamer1.0-droid
 - gstreamer1.0-libav
 - gstreamer1.0-plugins-good
 - gstreamer1.0-plugins-base
 - gstreamer1.0-plugins-bad
 - nemo-gstreamer1.0-interfaces
-- gstreamer1.0-droid
 
 # This is needed for notification LEDs
 - mce-plugin-libhybris
 
 ## USB mode controller
 # Enables mode selector upon plugging USB cable:
 - usb-moded
+- usb-moded-defaults-android
+- usb-moded-developer-mode-android
 # Connection sharing via USB (careful with roaming!)
 - usb-moded-connection-sharing-android-config
 
@@ -93,4 +92,4 @@ Requires:
 - nano
 - htop
 
-Summary: Jolla HW Adaptation cheeseburger
+Summary: Jolla HW Adaptation cheeseburger

rpm/droid-config-cheeseburger.spec

@@ -16,8 +16,4 @@ Obsoletes: ofono-configs-mer
 %define ofono_enable_plugins bluez5,hfp_ag_bluez5
 %define ofono_disable_plugins bluez4,dun_gw_bluez4,hfp_ag_bluez4,hfp_bluez4
 
-# Device-specific usb-moded configuration
-Provides: usb-moded-configs
-Obsoletes: usb-moded-defaults
-
 %include droid-configs-device/droid-configs.inc