diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 11:15:26 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 11:15:26 +0200 |
| commit | 19d829fa60fc4e6df514a046142faaaf9fc8185d (patch) | |
| tree | 295c75b0d9f3c7180f23ec131442286cf91db5b1 /board/congatec/cgtqmx6eval/README | |
| parent | e62d5fb0da76ef168e90cae9bbbda80349aaf137 (diff) | |
| parent | 8467faef7fce8c5faad7224b7737a58e16c52186 (diff) | |
| download | u-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.zip u-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.gz u-boot-imx-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/serial.c
The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.
Diffstat (limited to 'board/congatec/cgtqmx6eval/README')
| -rw-r--r-- | board/congatec/cgtqmx6eval/README | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/board/congatec/cgtqmx6eval/README b/board/congatec/cgtqmx6eval/README index bbf0f75..5e76d2a 100644 --- a/board/congatec/cgtqmx6eval/README +++ b/board/congatec/cgtqmx6eval/README @@ -7,8 +7,7 @@ Conga-QEVAl Evaluation Carrier board with qmx6 quad module. 1. Boot source, boot from SD card --------------------------------- -This version of u-boot works only on the SD card. By default, the -Congatec board can boot only from the SPI-NOR. +By default, the Congatec board can boot only from the SPI-NOR. But, with the u-boot version provided with the board you can write boot registers to force the board to reboot and boot from the SD slot. If "bmode" command is not available from your pre-installed u-boot, these |