diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-24 13:04:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-24 13:04:38 -0400 |
| commit | 18b9c98024ec89e00a57707f07ff6ada06089d26 (patch) | |
| tree | 60b4659a673d7a9dff309ee0d0b324c242a53cfc /common | |
| parent | b897306341024695d17296efc1f9d83d06368209 (diff) | |
| parent | 08140dba0f539842d4836afb56fe43a33d8ba045 (diff) | |
Merge branch '2020-04-24-master-imports'
- Assorted minor bugfixes.
- Resync fixdep with Linux v5.7-rc1
- Numerous changes to reduce SPL in various cases including when we have
read-only env support.
- Allow mkimage to align the header on FIT images to a specific size.
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 11 | ||||
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/dlmalloc.c | 2 | ||||
| -rw-r--r-- | common/spl/Kconfig | 6 |
4 files changed, 13 insertions, 8 deletions
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 diff --git a/common/dlmalloc.c b/common/dlmalloc.c index dade68faf7..db5ab55ed3 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -1,6 +1,6 @@ #include <common.h> -#if defined(CONFIG_UNIT_TEST) +#if CONFIG_IS_ENABLED(UNIT_TEST) #define DEBUG #endif diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 9d52b75cb4..ef5bf66696 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -508,12 +508,6 @@ config SPL_DMA the CPU moving the data. Enable this option to build the drivers in drivers/dma as part of an SPL build. -config SPL_DM_GPIO - bool "Support Driver Model GPIO drivers" - depends on SPL_GPIO_SUPPORT && DM_GPIO - help - Enable support for Driver Model based GPIO drivers in SPL. - config SPL_DRIVERS_MISC_SUPPORT bool "Support misc drivers" help |