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 /env/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 'env/Makefile')
| -rw-r--r-- | env/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/env/Makefile b/env/Makefile index e2a165b8f1b..c4ad6543286 100644 --- a/env/Makefile +++ b/env/Makefile @@ -7,9 +7,9 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += common.o obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += env.o obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += attr.o obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o -obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += callback.o ifndef CONFIG_SPL_BUILD +obj-y += callback.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o |