Patchwork [U-Boot,2/7,v3] integrator: move text offset to config

login
register
mail settings
Submitter Linus Walleij
Date Nov. 9, 2011, 4:14 p.m.
Message ID <1320855260-4131-1-git-send-email-linus.walleij@linaro.org>
Download mbox | patch
Permalink /patch/124584/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Comments

Linus Walleij - Nov. 9, 2011, 4:14 p.m.
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>
---
ChangeLog v1->v2:
- Rebased to U-Boot ARM HEAD at Alberts request, see message
  4EA1C8E7.7090105@aribaud.net
ChangeLog v2->v3:
- Rebased to U-Boot ARM HEAD at Alberts request, see message
  4EB84700.1030109@aribaud.net
---
 board/armltd/integrator/config.mk |    5 -----
 include/configs/integratorap.h    |    1 +
 include/configs/integratorcp.h    |    1 +
 3 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 board/armltd/integrator/config.mk

Patch

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