summaryrefslogtreecommitdiff
path: root/MAKEALL
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 /MAKEALL
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 'MAKEALL')
-rwxr-xr-xMAKEALL1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAKEALL b/MAKEALL
index ca69482..170bcad 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -561,6 +561,7 @@ LIST_ARM9=" \
cp946es \
cp966 \
da830evm \
+ da850evm \
edb9301 \
edb9302 \
edb9302a \