commit 21856468d6c71e5a963f3887f735b48717cdc02b
author Wolfgang Denk <wd@denx.de> Tue Oct 19 21:07:52 2010 +0200
committer Wolfgang Denk <wd@denx.de> Tue Oct 19 21:07:52 2010 +0200
tree a6a58200f5ea04c6d4ad2260dd031fcc6e4183ce
parent 8cc3b771a6fc8452c35344ce720df8d579493941
parent 429ddf69bb8a81c591c9de41957e911cd0719577

Merge branch 'elf_reloc'

Conflicts:
	arch/arm/include/asm/config.h
	board/LaCie/edminiv2/config.mk
	board/karo/tx25/config.mk
	board/logicpd/imx27lite/config.mk
	doc/README.arm-relocation

Signed-off-by: Wolfgang Denk <wd@denx.de>

board/logicpd/imx27lite/config.mk

diff --git a/board/logicpd/imx27lite/config.mk b/board/logicpd/imx27lite/config.mk
index 7f22154..018d920 100644
--- a/board/logicpd/imx27lite/config.mk
+++ b/board/logicpd/imx27lite/config.mk
@@ -1 +1,5 @@
+# with relocation CONFIG_SYS_TEXT_BASE can be anything, and making it 0
+# makes relative and absolute relocation fixups interchangeable.
+#CONFIG_SYS_TEXT_BASE = 0
+
 CONFIG_SYS_TEXT_BASE = 0xc0000000