diff options
| author | Tom Rini <[email protected]> | 2024-01-12 08:34:50 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-01-12 08:34:50 -0500 |
| commit | 547d3dd28a46a18d59e00a153c8becca8d4e8cf9 (patch) | |
| tree | 79a09ba118b2b4d3001bfd478206734d2727f4f7 /tools/Makefile | |
| parent | 2ee7a8ec6f1711abe9619fd8765edc16742be9de (diff) | |
| parent | 2027e99e61aab6fd8b06e2d752e0e538cff26eb6 (diff) | |
Merge branch '2024-01-12-assorted-fixes'
- Allow defconfigs to #include files (so we can construct a defconfig
from fragments), update phy-mtk-tphy binding, assorted test fixes,
allow building host tools without cryptographic libraries again,
android_ab bugfix, and make some SPL debugging cases easier.
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/Makefile b/tools/Makefile index 1aa1e36137b..6a4280e3668 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -94,6 +94,8 @@ LIBCRYPTO_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := \ generated/lib/fdt-libcrypto.o \ sunxi_toc0.o +KWB_IMAGE_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := kwbimage.o + ROCKCHIP_OBS = generated/lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o # common objs for dumpimage and mkimage @@ -114,7 +116,7 @@ dumpimage-mkimage-objs := aisimage.o \ imximage.o \ imx8image.o \ imx8mimage.o \ - kwbimage.o \ + $(KWB_IMAGE_OBJS-y) \ generated/lib/md5.o \ lpc32xximage.o \ mxsimage.o \ |