[U-Boot-Users] [PATCH] ColdFire: Assign version_string as data section in start.S

Tsi-Chung Liew Tsi-Chung.Liew at freescale.com
Wed Mar 26 12:44:05 CET 2008


The compiler does not place the .ascii in start.S to data section,
instead it put in under text section. This is an issue where it
never gets notice and causes error until an update for
tools/setlocalversion has been applied. A label of .data before
.globl version_string will force to put under data section.

Signed-off-by: TsiChung Liew <Tsi-Chung.Liew at freescale.com>
---
 cpu/mcf5227x/start.S   |    4 ++--
 cpu/mcf523x/start.S    |    4 ++--
 cpu/mcf52x2/start.S    |    4 ++--
 cpu/mcf5445x/start.S   |    4 ++--
 cpu/mcf547x_8x/start.S |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cpu/mcf5227x/start.S b/cpu/mcf5227x/start.S
index 0e2db12..454251a 100644
--- a/cpu/mcf5227x/start.S
+++ b/cpu/mcf5227x/start.S
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include "version.h"
+#include <version.h>
 
 #ifndef	 CONFIG_IDENT_STRING
 #define	 CONFIG_IDENT_STRING ""
@@ -348,7 +348,7 @@ dcache_status:
 	rts
 
 /*------------------------------------------------------------------------------*/
-
+	.data
 	.globl	version_string
 version_string:
 	.ascii U_BOOT_VERSION
diff --git a/cpu/mcf523x/start.S b/cpu/mcf523x/start.S
index 2bd603d..30c1b50 100644
--- a/cpu/mcf523x/start.S
+++ b/cpu/mcf523x/start.S
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include "version.h"
+#include <version.h>
 
 #ifndef	 CONFIG_IDENT_STRING
 #define	 CONFIG_IDENT_STRING ""
@@ -332,7 +332,7 @@ dcache_status:
 	rts
 
 /*------------------------------------------------------------------------------*/
-
+	.data
 	.globl	version_string
 version_string:
 	.ascii U_BOOT_VERSION
diff --git a/cpu/mcf52x2/start.S b/cpu/mcf52x2/start.S
index 9e496a4..c11d0cb 100644
--- a/cpu/mcf52x2/start.S
+++ b/cpu/mcf52x2/start.S
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include "version.h"
+#include <version.h>
 
 #ifndef	 CONFIG_IDENT_STRING
 #define	 CONFIG_IDENT_STRING ""
@@ -470,7 +470,7 @@ dcache_status:
 	rts
 
 /*------------------------------------------------------------------------------*/
-
+	.data
 	.globl	version_string
 version_string:
 	.ascii U_BOOT_VERSION
diff --git a/cpu/mcf5445x/start.S b/cpu/mcf5445x/start.S
index d64c5af..7532490 100644
--- a/cpu/mcf5445x/start.S
+++ b/cpu/mcf5445x/start.S
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include "version.h"
+#include <version.h>
 
 #ifndef	 CONFIG_IDENT_STRING
 #define	 CONFIG_IDENT_STRING ""
@@ -373,7 +373,7 @@ dcache_status:
 	rts
 
 /*------------------------------------------------------------------------------*/
-
+	.data
 	.globl	version_string
 version_string:
 	.ascii U_BOOT_VERSION
diff --git a/cpu/mcf547x_8x/start.S b/cpu/mcf547x_8x/start.S
index 442665f..c516341 100644
--- a/cpu/mcf547x_8x/start.S
+++ b/cpu/mcf547x_8x/start.S
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include "version.h"
+#include <version.h>
 
 #ifndef	 CONFIG_IDENT_STRING
 #define	 CONFIG_IDENT_STRING ""
@@ -353,7 +353,7 @@ dcache_status:
 	rts
 
 /*------------------------------------------------------------------------------*/
-
+	.data
 	.globl	version_string
 version_string:
 	.ascii U_BOOT_VERSION
-- 
1.5.4.1





More information about the U-Boot mailing list