summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-09-17 23:35:34 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-09-17 23:35:34 +0200
commitc292adae170fa8c27dca75963bdb0a9afc640e57 (patch)
tree3c1e6bddf7b2b6c6bb92a6329714db0850d05702 /doc
parenta7f99bf139b3aaa0d5494693fd0395084355e41a (diff)
parent4c97f16911e229f6d5bbea5bee52449916e5fa92 (diff)
downloadtalos-obmc-uboot-c292adae170fa8c27dca75963bdb0a9afc640e57.tar.gz
talos-obmc-uboot-c292adae170fa8c27dca75963bdb0a9afc640e57.zip
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'doc')
-rw-r--r--doc/README.imximage2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/README.imximage b/doc/README.imximage
index dcda2005af..27d3354569 100644
--- a/doc/README.imximage
+++ b/doc/README.imximage
@@ -120,7 +120,7 @@ Configuration command line syntax:
DATA 4 0x73FA88a0 0x200
The processor support up to 60 register programming commands for IMXIMAGE_VERSION 1
-and 121 register programming commands for IMXIMAGE_VERSION 2.
+and 220 register programming commands for IMXIMAGE_VERSION 2.
An error is generated if more commands are found in the configuration file.
3. All commands are optional to program.
OpenPOWER on IntegriCloud