Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

2013-03-15 15:18:31 +01:00
parent c44bb3a30f 19a0f7fa27
commit 6579d15c58
77 changed files with 5691 additions and 2766 deletions
--- a/8
+++ b/8
@@ -1037,6 +1037,14 @@ Pali Rohár <pali.rohar@gmail.com>

 	nokia_rx51	ARM ARMV7 (OMAP34xx SoC)

+Eric Nelson <eric.nelson@boundarydevices.com>
+	nitrogen6dl		i.MX6DL		1GB
+	nitrogen6dl2g		i.MX6DL		2GB
+	nitrogen6q		i.MX6Q/6D	1GB
+	nitrogen6q2g    	i.MX6Q/6D	2GB
+	nitrogen6s		i.MX6S		512MB
+	nitrogen6s1g		i.MX6S		1GB
+
 -------------------------------------------------------------------------

 Unknown / orphaned boards: