summaryrefslogtreecommitdiffstats
path: root/commands/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:01:34 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:01:34 +0100
commit856f60dbd157126241cf9033514137849bb5ca22 (patch)
treefca1784ef63b89a78127a0f4d1340f90eedd6848 /commands/Makefile
parentec78bea331e195fff267ae949cee4777ef1add56 (diff)
parentf4ca20c4d27751ee749f382cfd4949d825534fce (diff)
downloadbarebox-856f60dbd157126241cf9033514137849bb5ca22.tar.gz
barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.xz
Merge branch 'for-next/misc'
Conflicts: commands/Makefile Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/Makefile')
-rw-r--r--commands/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/commands/Makefile b/commands/Makefile
index 53c8c51665..db431d35f1 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -78,3 +78,4 @@ obj-$(CONFIG_CMD_CLK) += clk.o
obj-$(CONFIG_CMD_TFTP) += tftp.o
obj-$(CONFIG_CMD_FILETYPE) += filetype.o
obj-$(CONFIG_CMD_BAREBOX_UPDATE)+= barebox-update.o
+obj-$(CONFIG_CMD_MIITOOL) += miitool.o