[ptxdist] [PATCH 4/5] image-rauc: add support for crypt bundles

[Enrico Jorns <ejo@pengutronix.de>]

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 platforms/image-rauc.in |  8 ++++++++
 rules/image-rauc.make   | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in
index 3835e0718..7772fd95b 100644
--- a/platforms/image-rauc.in
+++ b/platforms/image-rauc.in
@@ -39,6 +39,14 @@ config IMAGE_RAUC_BUNDLE_FORMAT_VERITY
 	help
 	  The improved 'verity' bundle format
 
+config IMAGE_RAUC_BUNDLE_FORMAT_CRYPT
+	bool "crypt"
+	help
+	  The 'crypt' bundle format for fully encryptable bundles
+
+	  Note that you must run 'rauc encrypt' on a crypt bundle to generate a
+	  fully encrypted bundle.
+
 endchoice
 
 config IMAGE_RAUC_INTERMEDIATE
diff --git a/rules/image-rauc.make b/rules/image-rauc.make
index f7bed6e49..23d8d83b5 100644
--- a/rules/image-rauc.make
+++ b/rules/image-rauc.make
@@ -26,10 +26,20 @@ IMAGE_RAUC_CONFIG	:= rauc.config
 
 ifdef PTXCONF_IMAGE_RAUC
 
+ifdef PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_PLAIN
+IMAGE_RAUC_BUNDLE_FORMAT := "plain"
+endif
+ifdef PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_VERITY
+IMAGE_RAUC_BUNDLE_FORMAT := "verity"
+endif
+ifdef PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_CRYPT
+IMAGE_RAUC_BUNDLE_FORMAT := "crypt"
+endif
+
 IMAGE_RAUC_ENV	= \
 	$(CODE_SIGNING_ENV) \
 	RAUC_BUNDLE_COMPATIBLE="$(call remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \
-	RAUC_BUNDLE_FORMAT="$(call ptx/ifdef,PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_VERITY,verity,plain)" \
+	RAUC_BUNDLE_FORMAT=$(IMAGE_RAUC_BUNDLE_FORMAT) \
 	RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_RAUC_BUNDLE_VERSION))" \
 	RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \
 	RAUC_BUNDLE_DESCRIPTION=$(PTXCONF_IMAGE_RAUC_DESCRIPTION) \
-- 
2.30.2