summaryrefslogtreecommitdiff
path: root/boards.cfg
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-03-12 17:27:44 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-03-12 17:27:44 +0100
commit1acba3345c6f707195d8f1cbac834436445279b3 (patch)
tree87bfb4c157d998f88fee99e196a6f36a6b483903 /boards.cfg
parent76b40ab41eff1f402ee52ba768b09daad293b9bb (diff)
parent08f0533a147ca37546a6539b43fce3916e82811a (diff)
downloadu-boot-imx-1acba3345c6f707195d8f1cbac834436445279b3.zip
u-boot-imx-1acba3345c6f707195d8f1cbac834436445279b3.tar.gz
u-boot-imx-1acba3345c6f707195d8f1cbac834436445279b3.tar.bz2
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'boards.cfg')
-rw-r--r--boards.cfg1
1 files changed, 1 insertions, 0 deletions
diff --git a/boards.cfg b/boards.cfg
index 198cc5c..fdb32c2 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -95,6 +95,7 @@ at91sam9g10ek_nandflash arm arm926ejs at91sam9261ek atmel
at91sam9g20ek_dataflash_cs0 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0
at91sam9g20ek_dataflash_cs1 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1
at91sam9g20ek_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
+at91sam9g20ek_2mmc_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH
at91sam9m10g45ek_nandflash arm arm926ejs at91sam9m10g45ek atmel at91 at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
at91sam9rlek_dataflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
at91sam9rlek_nandflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH