summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-17 21:59:57 +0200
committerWolfgang Denk <wd@denx.de>2010-06-17 21:59:57 +0200
commit530135dcacac278798346ad5825c03131ce51772 (patch)
treec99311a1ebab3dc97c30a0a92d88f9183da69ab0 /Makefile
parent399b09331f313d57b16b583f453387231d217f15 (diff)
parent89b765c7f6ddfde07ba673dd4adbeb5da391a81b (diff)
downloadu-boot-imx-530135dcacac278798346ad5825c03131ce51772.zip
u-boot-imx-530135dcacac278798346ad5825c03131ce51772.tar.gz
u-boot-imx-530135dcacac278798346ad5825c03131ce51772.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ti
Conflicts: CONFLICT (rename/add): Rename board/davinci/da830evm/Makefile->board/ti/tnetv107xevm/Makefile in 89b765c7f6ddfde07ba673dd4adbeb5da391a81b. board/ti/tnetv107xevm/Makefile added in HEAD But files were identical, so no problem. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4d2d465..8d28460 100644
--- a/Makefile
+++ b/Makefile
@@ -2920,8 +2920,9 @@ cp922_XA10_config \
cp1026_config: unconfig
@board/armltd/integrator/split_by_variant.sh cp $@
-da830evm_config: unconfig
- @$(MKCONFIG) $(@:_config=) arm arm926ejs da830evm davinci davinci
+da830evm_config \
+da850evm_config: unconfig
+ @$(MKCONFIG) $(@:_config=) arm arm926ejs da8xxevm davinci davinci
davinci_dvevm_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci