diff options
| author | Tom Rini <[email protected]> | 2021-11-13 21:14:51 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-11-13 21:14:51 -0500 |
| commit | e035ce4b3ba116016385e8d93ef448c710810286 (patch) | |
| tree | 89cf25fb1c1cb99e18ca3ab1da98d70b9da0554f /test | |
| parent | b8a156f54ecd1e9a74f48a09a0735b4a41c90eba (diff) | |
| parent | 89cc0520d7962358ca85464836112217c5b8eca2 (diff) | |
Merge tag 'dm-pull-13nov21' of https://source.denx.de/u-boot/custodians/u-boot-dm
env tidy-ups
test fixes
binman fixes and ELF enhancements
Diffstat (limited to 'test')
| -rw-r--r-- | test/dm/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/dm/Makefile b/test/dm/Makefile index 7de013f6368..548649f8e82 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -106,6 +106,8 @@ obj-$(CONFIG_TIMER) += timer.o obj-$(CONFIG_DM_USB) += usb.o obj-$(CONFIG_DM_VIDEO) += video.o obj-$(CONFIG_VIRTIO_SANDBOX) += virtio.o -obj-$(CONFIG_WDT) += wdt.o +ifeq ($(CONFIG_WDT_GPIO)$(CONFIG_WDT_SANDBOX),yy) +obj-y += wdt.o +endif endif endif # !SPL |