Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

02cf8fd6 · Wolfgang Denk · f2b382ea · 4262a7c9 · 02cf8fd6 · f2b382ea
Commit 02cf8fd6 authored 14 years ago by Wolfgang Denk
--- a/board/xaeniax/Makefile
+++ b/board/xaeniax/Makefile
--- a/board/xaeniax/config.mk
+++ b/board/xaeniax/config.mk
-CONFIG_SYS_TEXT_BASE = 0xa3FB0000
-#CONFIG_SYS_TEXT_BASE = 0
--- a/board/xaeniax/lowlevel_init.S
+++ b/board/xaeniax/lowlevel_init.S
--- a/board/xaeniax/xaeniax.c
+++ b/board/xaeniax/xaeniax.c
--- a/board/xm250/Makefile
+++ b/board/xm250/Makefile
--- a/board/xm250/config.mk
+++ b/board/xm250/config.mk
--- a/board/xm250/lowlevel_init.S
+++ b/board/xm250/lowlevel_init.S
--- a/board/xm250/xm250.c
+++ b/board/xm250/xm250.c
--- a/board/xsengine/Makefile
+++ b/board/xsengine/Makefile
--- a/board/xsengine/config.mk
+++ b/board/xsengine/config.mk
-CONFIG_SYS_TEXT_BASE = 0xA3F80000
--- a/board/xsengine/flash.c
+++ b/board/xsengine/flash.c
--- a/board/xsengine/lowlevel_init.S
+++ b/board/xsengine/lowlevel_init.S
--- a/board/xsengine/xsengine.c
+++ b/board/xsengine/xsengine.c
--- a/boards.cfg
+++ b/boards.cfg
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -39,7 +39,7 @@
 #define	CONFIG_ENV_SIZE			0x4000
 #define	CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024)
 #define	CONFIG_SYS_GBL_DATA_SIZE	128
+#define	CONFIG_SYS_TEXT_BASE		0x0
 #define	CONFIG_ENV_OVERWRITE		/* override default environment */
 #define	CONFIG_BOOTCOMMAND						\

--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h