summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-17 22:22:06 +0200
committerWolfgang Denk <wd@denx.de>2010-06-17 22:22:06 +0200
commitcecda170e7816d10edf0f5e64c420e9c618001ec (patch)
tree6b3d539057e9719818cfd671e77eaef08e1d255c /Makefile
parent530135dcacac278798346ad5825c03131ce51772 (diff)
parentce9c227cc71afc3b4c78dcc0a565c40d4ad943e4 (diff)
downloadu-boot-imx-cecda170e7816d10edf0f5e64c420e9c618001ec.zip
u-boot-imx-cecda170e7816d10edf0f5e64c420e9c618001ec.tar.gz
u-boot-imx-cecda170e7816d10edf0f5e64c420e9c618001ec.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8d28460..55bb964 100644
--- a/Makefile
+++ b/Makefile
@@ -2948,6 +2948,9 @@ davinci_dm365evm_config : unconfig
davinci_dm6467evm_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci
+edminiv2_config: unconfig
+ @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) LaCie orion5x
+
guruplug_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood