summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2020-04-15 18:46:21 +0200
committerTom Rini <trini@konsulko.com>2020-04-24 10:51:32 -0400
commit6441164dda7dac0c4039c90c329e973786c21b22 (patch)
treee8d5fad96c2d36ed611b5a96f8c01fb40f33347b
parent4f4d526f593de46a165342259c9cb9648c1e70d8 (diff)
common: image_sign_info helper functions in SPL
Do not build image_sign_info helper functions in SPL if not needed. Fixes: b983cc2da0ba ("lib: rsa: decouple rsa from FIT image verification") Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r--Kconfig2
-rw-r--r--common/Kconfig11
-rw-r--r--common/Makefile2
3 files changed, 13 insertions, 2 deletions
diff --git a/Kconfig b/Kconfig
index 8bae87e3f6..83b5b05392 100644
--- a/Kconfig
+++ b/Kconfig
@@ -447,7 +447,7 @@ config SPL_FIT_SIGNATURE
select SPL_FIT
select SPL_RSA
select SPL_RSA_VERIFY
- select IMAGE_SIGN_INFO
+ select SPL_IMAGE_SIGN_INFO
config SPL_LOAD_FIT
bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"
diff --git a/common/Kconfig b/common/Kconfig
index ee4f748c32..30cba15948 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1060,3 +1060,14 @@ config IMAGE_SIGN_INFO
select SHA256
help
Enable image_sign_info helper functions.
+
+if IMAGE_SIGN_INFO
+
+config SPL_IMAGE_SIGN_INFO
+ bool
+ select SHA1
+ select SHA256
+ help
+ Enable image_sign_info helper functions in SPL.
+
+endif
diff --git a/common/Makefile b/common/Makefile
index d84e10ba99..3471c47be5 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -112,7 +112,7 @@ obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o
obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o
obj-$(CONFIG_$(SPL_)MULTI_DTB_FIT) += boot_fit.o common_fit.o
-obj-$(CONFIG_IMAGE_SIGN_INFO) += image-sig.o
+obj-$(CONFIG_$(SPL_TPL_)IMAGE_SIGN_INFO) += image-sig.o
obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += image-fit-sig.o
obj-$(CONFIG_$(SPL_TPL_)FIT_CIPHER) += image-cipher.o
obj-$(CONFIG_IO_TRACE) += iotrace.o