diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:09 +0100 |
| commit | bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98 (patch) | |
| tree | 3cf8336e5c2c6341120a2b68f8bb7a5df385fb64 /commands/Makefile | |
| parent | 38c75d0f112d4e8bc3762cd8d0b6dbae3cf7e441 (diff) | |
| parent | 4f2ac27e2503e15bffdebca4757e02638686fe94 (diff) | |
| download | barebox-bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98.tar.gz barebox-bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/boards/guf-neso/lowlevel.c
arch/arm/boards/pcm038/lowlevel.c
commands/Makefile
Diffstat (limited to 'commands/Makefile')
| -rw-r--r-- | commands/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/commands/Makefile b/commands/Makefile index 6540802677..53c8c51665 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -77,3 +77,4 @@ obj-$(CONFIG_CMD_LN) += ln.o 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 |