From 18afa6b76c12607b4cf45fa922c1c77c9163c8eb Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@codecoup.pl>
Date: Tue, 16 Apr 2019 22:35:32 +0200
Subject: [PATCH] apps: Fix bootutils dependencies

Some applications were polling bootutils even if not using it.
bleprph is using it for DIS information so depend on mcuboot instead
and enable DIS by default.
---
 apps/blecsc/pkg.yml         | 1 -
 apps/blehr/pkg.yml          | 1 -
 apps/bleprph/pkg.yml        | 2 +-
 apps/bleprph/syscfg.yml     | 2 +-
 apps/ext_advertiser/pkg.yml | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/blecsc/pkg.yml b/apps/blecsc/pkg.yml
index 86a17433a..828ff301e 100644
--- a/apps/blecsc/pkg.yml
+++ b/apps/blecsc/pkg.yml
@@ -25,7 +25,6 @@ pkg.homepage: "http://mynewt.apache.org/"
 pkg.keywords:
 
 pkg.deps:
-    - "@apache-mynewt-core/boot/bootutil"
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/sys/console/full"
     - "@apache-mynewt-core/sys/log/full"
diff --git a/apps/blehr/pkg.yml b/apps/blehr/pkg.yml
index 5fb705b15..b91ba3775 100644
--- a/apps/blehr/pkg.yml
+++ b/apps/blehr/pkg.yml
@@ -25,7 +25,6 @@ pkg.homepage: "http://mynewt.apache.org/"
 pkg.keywords:
 
 pkg.deps:
-    - "@apache-mynewt-core/boot/bootutil"
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/sys/console/full"
     - "@apache-mynewt-core/sys/log/full"
diff --git a/apps/bleprph/pkg.yml b/apps/bleprph/pkg.yml
index 2f7a3c60c..844c99afd 100644
--- a/apps/bleprph/pkg.yml
+++ b/apps/bleprph/pkg.yml
@@ -24,7 +24,7 @@ pkg.keywords:
 
 pkg.deps:
     - "@apache-mynewt-core/boot/split"
-    - "@apache-mynewt-core/boot/bootutil"
+    - "@mcuboot/boot/bootutil"
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/mgmt/imgmgr"
     - "@apache-mynewt-core/mgmt/newtmgr"
diff --git a/apps/bleprph/syscfg.yml b/apps/bleprph/syscfg.yml
index 7cd9fe9dd..bd0ca1427 100644
--- a/apps/bleprph/syscfg.yml
+++ b/apps/bleprph/syscfg.yml
@@ -45,7 +45,7 @@ syscfg.vals:
     BLE_ROLE_PERIPHERAL: 1
 
     # Configure DIS
-    BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM: 0
+    BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM: 1
 
     # Log reboot messages to a flash circular buffer.
     REBOOT_LOG_FCB: 1
diff --git a/apps/ext_advertiser/pkg.yml b/apps/ext_advertiser/pkg.yml
index a743d2085..097764b20 100644
--- a/apps/ext_advertiser/pkg.yml
+++ b/apps/ext_advertiser/pkg.yml
@@ -32,7 +32,6 @@ pkg.deps:
     - nimble/host/services/gatt
     - nimble/host/store/config
     - nimble/transport/ram
-    - "@apache-mynewt-core/boot/bootutil"
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/sys/console/full"
     - "@apache-mynewt-core/sys/log/full"