diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-18 23:43:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-18 23:48:15 +0200 |
| commit | c8d76eaf606096eddbe62b8a86545f5116f5189c (patch) | |
| tree | a38043189a96b391d421d83aa875eac662d3f01f /doc | |
| parent | 1ba91ba23396005ef7b42381cc21f0baf78d0d60 (diff) | |
| download | u-boot-imx-c8d76eaf606096eddbe62b8a86545f5116f5189c.zip u-boot-imx-c8d76eaf606096eddbe62b8a86545f5116f5189c.tar.gz u-boot-imx-c8d76eaf606096eddbe62b8a86545f5116f5189c.tar.bz2 | |
Rename TEXT_BASE: fix merge conflicts
Commit 14d0a02a "Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE" missed a
few places, especially for boards that were added inbetween. Fix the
remaining issues.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.arm-relocation | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/README.arm-relocation b/doc/README.arm-relocation index 4ab3c7c..e9fe999 100644 --- a/doc/README.arm-relocation +++ b/doc/README.arm-relocation @@ -92,11 +92,11 @@ Relocation with NAND_SPL (example for the tx25): the "real" u-boot to CONFIG_SYS_NAND_U_BOOT_DST and starts execution @CONFIG_SYS_NAND_U_BOOT_START -- This u-boot does no ram int, nor cpu register setup. Just looks - where it have to relocate and relocate itself to this address. - If relocate address = CONFIG_SYS_TEXT_BASE(not the same, as the TEXT_BASE - from the nand_spl code), no need to copy, just go on with bss clear - and jump to board_init_r. +- This u-boot does no RAM init, nor CPU register setup. Just look + where it has to copy and relocate itself to this address. If + relocate address = CONFIG_SYS_TEXT_BASE (not the same, as the + CONFIG_SYS_TEXT_BASE from the nand_spl code), then there is no need + to copy, just go on with bss clear and jump to board_init_r. ------------------------------------------------------------------------------------- |