Merge branch 'master' into next
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
diff --git a/boards.cfg b/boards.cfg
index e54673e..6efde75 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -227,6 +227,7 @@
grsim sparc leon3 - gaisler
imx31_litekit arm arm1136 - logicpd mx31
omap2420h4 arm arm1136 - ti omap24xx
+tnetv107x_evm arm arm1176 tnetv107xevm ti tnetv107x
armadillo arm arm720t
modnet50 arm arm720t
lpc2292sodimm arm arm720t - - lpc2292
@@ -238,8 +239,13 @@
smdk2410 arm arm920t - samsung s3c24x0
voiceblue arm arm925t
omap1510inn arm arm925t - ti
-at91cap9adk arm arm926ejs - atmel at91
afeb9260 arm arm926ejs - - at91
+at91cap9adk arm arm926ejs - atmel at91
+davinci_dvevm arm arm926ejs dvevm davinci davinci
+davinci_sffsdr arm arm926ejs sffsdr davinci davinci
+davinci_sonata arm arm926ejs sonata davinci davinci
+da830evm arm arm926ejs da8xxevm davinci davinci
+da850evm arm arm926ejs da8xxevm davinci davinci
guruplug arm arm926ejs - Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood
openrd_base arm arm926ejs - Marvell kirkwood
@@ -247,10 +253,11 @@
imx27lite arm arm926ejs imx27lite logicpd mx27
magnesium arm arm926ejs imx27lite logicpd mx27
omap5912osk arm arm926ejs - ti omap
-omap3_zoom1 arm arm_cortexa8 zoom1 logicpd omap3
-omap3_zoom2 arm arm_cortexa8 zoom2 logicpd omap3
+edminiv2 arm arm926ejs - LaCie orion5x
omap3_overo arm arm_cortexa8 overo - omap3
omap3_pandora arm arm_cortexa8 pandora - omap3
+omap3_zoom1 arm arm_cortexa8 zoom1 logicpd omap3
+omap3_zoom2 arm arm_cortexa8 zoom2 logicpd omap3
omap3_beagle arm arm_cortexa8 beagle ti omap3
omap3_evm arm arm_cortexa8 evm ti omap3
omap3_sdp3430 arm arm_cortexa8 sdp3430 ti omap3
@@ -354,3 +361,8 @@
gr_cpci_ax2000 sparc leon3 - gaisler
gr_ep2s60 sparc leon3 - gaisler
gr_xc3s_1500 sparc leon3 - gaisler
+davinci_dm355evm arm arm926ejs dm355evm davinci davinci
+davinci_dm365evm arm arm926ejs dm365evm davinci davinci
+davinci_dm6467evm arm arm926ejs dm6467evm davinci davinci
+davinci_schmoogie arm arm926ejs schmoogie davinci davinci
+davinci_dm355leopard arm arm926ejs dm355leopard davinci davinci