diff options
author | Tom Rini <trini@konsulko.com> | 2020-01-10 16:38:40 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-10 16:38:40 -0500 |
commit | ef2f0d323652c1162937df668b33b3bfe0ca3904 (patch) | |
tree | f957b7e9edcf79403f8a582d17dc4103f293fc10 /common/Makefile | |
parent | c00bd81ae0d6eb1f94e26b31be3a64cadaa05bcb (diff) | |
parent | 4f731c795d75aee548f6886f4f0da0a49a99354d (diff) |
Merge branch '2020-01-10-master-imports'
- Android image support enhancements
- Assorted ARM fixes and enhancements
- m68k update
Diffstat (limited to 'common/Makefile')
-rw-r--r-- | common/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index 302d8beaf3..029cc0f2ce 100644 --- a/common/Makefile +++ b/common/Makefile @@ -117,7 +117,7 @@ obj-$(CONFIG_IO_TRACE) += iotrace.o obj-y += memsize.o obj-y += stdio.o -obj-$(CONFIG_CMD_DTIMG) += image-android-dt.o +obj-$(CONFIG_CMD_ADTIMG) += image-android-dt.o ifdef CONFIG_CMD_EEPROM_LAYOUT obj-y += eeprom/eeprom_field.o eeprom/eeprom_layout.o |