diff options
| author | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-13 15:16:15 -0400 |
| commit | 41341221d12341a2ecfb280142d6478071738fc2 (patch) | |
| tree | 850a87b274b572b65a579474a0aad5e590ca6d61 /doc | |
| parent | b7ab8b8ff092ab8214eeb86e8a79573154f448b9 (diff) | |
| parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) | |
| download | u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.zip u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.tar.gz u-boot-imx-41341221d12341a2ecfb280142d6478071738fc2.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR
Conflicts:
arch/arm/include/asm/arch-omap5/omap.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.mxc_ocotp | 1 | ||||
| -rw-r--r-- | doc/README.scrapyard | 1 | ||||
| -rw-r--r-- | doc/README.vf610 | 10 |
3 files changed, 12 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 diff --git a/doc/README.scrapyard b/doc/README.scrapyard index 9223f6e..a0f1fa3 100644 --- a/doc/README.scrapyard +++ b/doc/README.scrapyard @@ -96,3 +96,4 @@ R5200 ColdFire - 48ead7a 2008-03-31 Zachary P. L CPCI440 powerpc 440GP b568fd2 2007-12-27 Matthias Fuchs <matthias.fuchs@esd-electronics.com> PCIPPC2 powerpc MPC740/MPC750 7c9e89b 2013-02-07 Wolfgang Denk <wd@denx.de> PCIPPC6 powerpc MPC740/MPC750 - - Wolfgang Denk <wd@denx.de> +omap2420h4 arm omap24xx - 2013-06-04 Richard Woodruff <r-woodruff2@ti.com> diff --git a/doc/README.vf610 b/doc/README.vf610 new file mode 100644 index 0000000..38cf5cf --- /dev/null +++ b/doc/README.vf610 @@ -0,0 +1,10 @@ +U-Boot for Freescale Vybrid VF610 + +This file contains information for the port of U-Boot to the Freescale Vybrid +VF610 SoC. + +1. CONVENTIONS FOR FUSE ASSIGNMENTS +----------------------------------- + +1.1 MAC Address: It is stored in fuse bank 4, with the 16 msbs in word 2 and the + 32 lsbs in word 3. |