diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-19 12:04:45 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-19 12:04:45 +0100 |
| commit | e7538fee991308c16f76f7eca2517089f2a30ff4 (patch) | |
| tree | 13530e6f549f997d680eaaba087bdb32f68989b6 /board/boundary/nitrogen6x/nitrogen6s1g.cfg | |
| parent | 1feb6e3c9216a34885f24f0df4a02a30dfb35f19 (diff) | |
| parent | da781c60e5d55904d77931fcb63f25e65e2228be (diff) | |
| download | talos-obmc-uboot-e7538fee991308c16f76f7eca2517089f2a30ff4.tar.gz talos-obmc-uboot-e7538fee991308c16f76f7eca2517089f2a30ff4.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/boundary/nitrogen6x/nitrogen6s1g.cfg')
| -rw-r--r-- | board/boundary/nitrogen6x/nitrogen6s1g.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/boundary/nitrogen6x/nitrogen6s1g.cfg b/board/boundary/nitrogen6x/nitrogen6s1g.cfg index d61453c665..b1489fb907 100644 --- a/board/boundary/nitrogen6x/nitrogen6s1g.cfg +++ b/board/boundary/nitrogen6x/nitrogen6s1g.cfg @@ -16,7 +16,7 @@ IMAGE_VERSION 2 * Boot Device : one of * spi, sd (the board has no nand neither onenand) */ -BOOT_FROM sd +BOOT_FROM spi #define __ASSEMBLY__ #include <config.h> |
