diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:15:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:15:16 +0200 |
| commit | 5b7b7ee5d943c6b58d9b7f974167d0105ca1b787 (patch) | |
| tree | 5b01a8a5d8fa8f91f56547761df026adce9dabeb /common/Makefile | |
| parent | f1ee4e8b73a356278056666da8d0c6b5aa53088d (diff) | |
| parent | 07f93f54521c212558eb09adc812d97dffda443b (diff) | |
| download | barebox-5b7b7ee5d943c6b58d9b7f974167d0105ca1b787.tar.gz barebox-5b7b7ee5d943c6b58d9b7f974167d0105ca1b787.tar.xz | |
Merge branch 'for-next/metadata'
Conflicts:
arch/arm/dts/Makefile
common/Makefile
lib/Makefile
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index 4220e15127..ddd7db2578 100644 --- a/common/Makefile +++ b/common/Makefile @@ -46,6 +46,8 @@ obj-$(CONFIG_UIMAGE) += image.o uimage.o obj-$(CONFIG_MENUTREE) += menutree.o obj-$(CONFIG_EFI_GUID) += efi-guid.o obj-$(CONFIG_EFI_DEVICEPATH) += efi-devicepath.o +lwl-$(CONFIG_IMD) += imd-barebox.o +obj-$(CONFIG_IMD) += imd.o quiet_cmd_pwd_h = PWDH $@ ifdef CONFIG_PASSWORD |