diff options
| author | Tom Rini <[email protected]> | 2023-10-10 08:54:17 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-10-10 08:54:17 -0400 |
| commit | 833ff23047c50e4053fb1bda21f4e2c9f6a3aa6a (patch) | |
| tree | 422a1ac1688b75a6c4edcbaa2024346acbaddfb8 /Makefile | |
| parent | d9bb6d779b69c2548891e568e5e2a23e1b7eedaa (diff) | |
| parent | 3f876cb7c57511174d1b6a3e089443ccbaf236ec (diff) | |
Merge branch '2023-10-09-assorted-fixes'
- Cleanup how we pick what to launch in SPL, a few test changes, some TI
K3 platform updates, top-level Makefile fixes and related cleanup,
correct a problem with LMB overlap, other assorted fixes.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -886,7 +886,7 @@ libs-$(CONFIG_UT_ENV) += test/env/ libs-$(CONFIG_UT_OPTEE) += test/optee/ libs-$(CONFIG_UT_OVERLAY) += test/overlay/ -libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/) +libs-y += $(if $(wildcard $(srctree)/board/$(BOARDDIR)/Makefile),board/$(BOARDDIR)/) libs-y := $(sort $(libs-y)) @@ -1831,7 +1831,7 @@ quiet_cmd_envc = ENVC $@ touch $@ ; \ fi -include/generated/env.txt: $(wildcard $(ENV_FILE)) +include/generated/env.txt: $(wildcard $(ENV_FILE)) include/generated/autoconf.h $(call cmd,envc) # Write out the resulting environment, converted to a C string |