summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-11-09 06:14:20 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-11-10 15:26:58 +0100
commita4c15c01bfdf5a3345bda4da249ebde2fe742caa (patch)
tree131da36e8c6b4fb7ef423791ac5e1922914f0438
parent7d2fd0d1d00dee2a7f49a68ea9905511cdc1a626 (diff)
downloadu-boot-imx-a4c15c01bfdf5a3345bda4da249ebde2fe742caa.zip
u-boot-imx-a4c15c01bfdf5a3345bda4da249ebde2fe742caa.tar.gz
u-boot-imx-a4c15c01bfdf5a3345bda4da249ebde2fe742caa.tar.bz2
integrator: move text offset to config
Do away with the config.mk file and move the text offset to the config files to make things easier. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--board/armltd/integrator/config.mk5
-rw-r--r--include/configs/integratorap.h1
-rw-r--r--include/configs/integratorcp.h1
3 files changed, 2 insertions, 5 deletions
diff --git a/board/armltd/integrator/config.mk b/board/armltd/integrator/config.mk
deleted file mode 100644
index 8b57af1..0000000
--- a/board/armltd/integrator/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# image should be loaded at 0x01000000
-#
-
-CONFIG_SYS_TEXT_BASE = 0x01000000
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 61b8761..a1fdbb8 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -37,6 +37,7 @@
* High Level Configuration Options
* (easy to change)
*/
+#define CONFIG_SYS_TEXT_BASE 0x01000000
#define CONFIG_SYS_MEMTEST_START 0x100000
#define CONFIG_SYS_MEMTEST_END 0x10000000
#define CONFIG_SYS_HZ 1000
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 7ae34b7..ccbdf44 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -37,6 +37,7 @@
* High Level Configuration Options
* (easy to change)
*/
+#define CONFIG_SYS_TEXT_BASE 0x01000000
#define CONFIG_SYS_MEMTEST_START 0x100000
#define CONFIG_SYS_MEMTEST_END 0x10000000
#define CONFIG_SYS_HZ 1000