diff options
| author | Tom Rini <[email protected]> | 2020-04-24 13:04:38 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-04-24 13:04:38 -0400 |
| commit | 18b9c98024ec89e00a57707f07ff6ada06089d26 (patch) | |
| tree | 60b4659a673d7a9dff309ee0d0b324c242a53cfc /lib/Makefile | |
| 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 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile index 5f88d92850f..ded9a932aa0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -120,6 +120,7 @@ obj-$(CONFIG_$(SPL_TPL_)STRTO) += strto.o else # Main U-Boot always uses the full printf support obj-y += vsprintf.o strto.o +obj-$(CONFIG_OID_REGISTRY) += oid_registry.o endif obj-y += date.o @@ -128,8 +129,6 @@ obj-$(CONFIG_LIB_ELF) += elf.o # # Build a fast OID lookup registry from include/linux/oid_registry.h # -obj-$(CONFIG_OID_REGISTRY) += oid_registry.o - $(obj)/oid_registry.o: $(obj)/oid_registry_data.c $(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \ |