diff mbox series

[meta-swupdate] swupdate: Use rpi config as default

Message ID 20200227215839.1799328-1-raj.khem@gmail.com
State New
Headers show
Series [meta-swupdate] swupdate: Use rpi config as default | expand

Commit Message

Khem Raj Feb. 27, 2020, 9:58 p.m. UTC
Add missing dependency on json-c

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-support/swupdate/swupdate.inc       |  2 +-
 recipes-support/swupdate/swupdate/defconfig | 37 ++++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)
diff mbox series

Patch

diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc
index 4137ed4..2e20b88 100644
--- a/recipes-support/swupdate/swupdate.inc
+++ b/recipes-support/swupdate/swupdate.inc
@@ -1,7 +1,7 @@ 
 SUMMARY="Image updater for Yocto projects"
 DESCRIPTION = "Application for automatic software update from USB Pen"
 SECTION="swupdate"
-DEPENDS = "libconfig"
+DEPENDS = "libconfig json-c"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
diff --git a/recipes-support/swupdate/swupdate/defconfig b/recipes-support/swupdate/swupdate/defconfig
index ffb3ea4..f651603 100644
--- a/recipes-support/swupdate/swupdate/defconfig
+++ b/recipes-support/swupdate/swupdate/defconfig
@@ -15,7 +15,7 @@  CONFIG_SCRIPTS=y
 CONFIG_HW_COMPATIBILITY=y
 CONFIG_HW_COMPATIBILITY_FILE="/etc/hwrevision"
 CONFIG_SW_VERSIONS_FILE="/etc/sw-versions"
-CONFIG_MTD=y
+# CONFIG_MTD is not set
 CONFIG_LUA=y
 CONFIG_LUAPKG="lua"
 # CONFIG_FEATURE_SYSLOG is not set
@@ -40,21 +40,31 @@  CONFIG_UBOOT=y
 # CONFIG_BOOTLOADER_NONE is not set
 # CONFIG_BOOTLOADER_GRUB is not set
 CONFIG_UBOOT_FWENV="/etc/fw_env.config"
-# CONFIG_DOWNLOAD is not set
-# CONFIG_HASH_VERIFY is not set
+CONFIG_UBOOT_NEWAPI=y
+CONFIG_UBOOT_DEFAULTENV="/etc/u-boot-initial-env"
+CONFIG_DOWNLOAD=y
+CONFIG_HASH_VERIFY=y
 # CONFIG_SIGNED_IMAGES is not set
-# CONFIG_ENCRYPTED_IMAGES is not set
-# CONFIG_SURICATTA is not set
+CONFIG_ENCRYPTED_IMAGES=y
+CONFIG_SURICATTA=y
 
 #
 # Suricatta
 #
 
+#
+# Features
+#
+CONFIG_SURICATTA_SSL=y
+# CONFIG_SURICATTA_STATE_CHOICE_NONE is not set
+CONFIG_SURICATTA_STATE_CHOICE_BOOTLOADER=y
+CONFIG_SURICATTA_STATE_BOOTLOADER="ustate"
+
 #
 # Server
 #
-# CONFIG_SURICATTA_HAWKBIT is not set
-CONFIG_SURICATTA_SERVER_NONE=y
+CONFIG_SURICATTA_HAWKBIT=y
+# CONFIG_SURICATTA_SERVER_NONE is not set
 CONFIG_WEBSERVER=y
 
 #
@@ -66,7 +76,7 @@  CONFIG_MONGOOSE=y
 # Mongoose Feature
 #
 CONFIG_MONGOOSELUA=y
-CONFIG_MONGOOSEIPV6=y
+# CONFIG_MONGOOSEIPV6 is not set
 CONFIG_MONGOOSESSL=y
 
 #
@@ -79,20 +89,17 @@  CONFIG_GUNZIP=y
 #
 CONFIG_LIBCONFIG=y
 CONFIG_PARSERROOT=""
-# CONFIG_JSON is not set
+CONFIG_JSON=y
 # CONFIG_LUAEXTERNAL is not set
 # CONFIG_SETSWDESCRIPTION is not set
 
 #
 # Image Handlers
 #
-# CONFIG_UBIVOL is not set
-CONFIG_CFI=y
-# CONFIG_CFIHAMMING1 is not set
 CONFIG_RAW=y
 CONFIG_LUASCRIPTHANDLER=y
 CONFIG_SHELLSCRIPTHANDLER=y
 # CONFIG_HANDLER_IN_LUA is not set
-# CONFIG_ARCHIVE is not set
-# CONFIG_REMOTE_HANDLER is not set
-# CONFIG_BOOTLOADERHANDLER is not set
+CONFIG_ARCHIVE=y
+CONFIG_REMOTE_HANDLER=y
+CONFIG_BOOTLOADERHANDLER=y