diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 12:35:10 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 12:35:10 (GMT) |
commit | 10e167329b029890a4c704f094822da5f259b886 (patch) | |
tree | c0950b7cb928ee26b07c39348e4539602ce3aec9 /doc/README.mxc_ocotp | |
parent | dbc000bfb51eb30d786521e6b8e29048c36cbefa (diff) | |
parent | 4a1c7b13ae104d4526d3176793b7f6b06694df15 (diff) | |
download | u-boot-10e167329b029890a4c704f094822da5f259b886.tar.xz |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/Makefile
Diffstat (limited to 'doc/README.mxc_ocotp')
-rw-r--r-- | doc/README.mxc_ocotp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/README.mxc_ocotp b/doc/README.mxc_ocotp index 9a53311..7a2863c 100644 --- a/doc/README.mxc_ocotp +++ b/doc/README.mxc_ocotp @@ -2,6 +2,7 @@ Driver implementing the fuse API for Freescale's On-Chip OTP Controller (OCOTP) on MXC This IP can be found on the following SoCs: + - Vybrid VF610, - i.MX6. Note that this IP is different from albeit similar to the IPs of the same name |