[U-Boot] [PATCH] add missing space

Luka Perkov lists at lukaperkov.net
Sat Dec 17 00:43:18 CET 2011 

On Fri, Dec 16, 2011 at 10:59:03AM -0500, Mike Frysinger wrote:
> On Friday 16 December 2011 07:13:47 Anatolij Gustschin wrote:
> > On Fri, 16 Dec 2011 00:32:15 +0100 Luka Perkov wrote:
> > > Cosmetic patch for first U-Boot line that gets printed.
> > > 
> > > --- a/include/version.h
> > > +++ b/include/version.h
> > > 
> > >  #define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \
> > > -	U_BOOT_TIME ")" CONFIG_IDENT_STRING
> > > +	U_BOOT_TIME ") " CONFIG_IDENT_STRING
> > 
> > This change is not needed I think. Most boards defining
> > CONFIG_IDENT_STRING use either a string starting with new line or
> > strings like " something". So this patch will deface version string.
> > Your CONFIG_IDENT_STRING should be fixed instead.
> 
> +1
> -mike

Ok, thanks for pointing this out. I guess that something like patch
bellow is not acceptable?

# grep CONFIG_IDENT_STRING * -r | grep '" ' | wc -l
41

Bye,
Luka

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 68a0cfd..01e5b93 100644
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -41,9 +41,9 @@
  * Identify the board
  */
 #if !defined(CONFIG_SC)
-#define CONFIG_IDENT_STRING		" B2"
+#define CONFIG_IDENT_STRING		"B2"
 #else
-#define CONFIG_IDENT_STRING		" SC"
+#define CONFIG_IDENT_STRING		"SC"
 #endif
 
 /*
diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index b827954..7d8d2e0 100644
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -39,11 +39,11 @@
 #define	CONFIG_SYS_TEXT_BASE	0xFF000000
 
 #if defined (CONFIG_IVML24_16M)
-# define CONFIG_IDENT_STRING     " IVML24"
+# define CONFIG_IDENT_STRING     "IVML24"
 #elif defined (CONFIG_IVML24_32M)
-# define CONFIG_IDENT_STRING     " IVML24_128"
+# define CONFIG_IDENT_STRING     "IVML24_128"
 #elif defined (CONFIG_IVML24_64M)
-# define CONFIG_IDENT_STRING     " IVML24_256"
+# define CONFIG_IDENT_STRING     "IVML24_256"
 #endif
 
 #define	CONFIG_8xx_CONS_SMC1	1	/* Console is on SMC1		*/
diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h
index 9b0c32a..9a3b258 100644
--- a/include/configs/IVMS8.h
+++ b/include/configs/IVMS8.h
@@ -39,11 +39,11 @@
 #define	CONFIG_SYS_TEXT_BASE	0xFF000000
 
 #if defined (CONFIG_IVMS8_16M)
-# define CONFIG_IDENT_STRING     " IVMS8"
+# define CONFIG_IDENT_STRING     "IVMS8"
 #elif defined (CONFIG_IVMS8_32M)
-# define CONFIG_IDENT_STRING     " IVMS8_128"
+# define CONFIG_IDENT_STRING     "IVMS8_128"
 #elif defined (CONFIG_IVMS8_64M)
-# define CONFIG_IDENT_STRING     " IVMS8_256"
+# define CONFIG_IDENT_STRING     "IVMS8_256"
 #endif
 
 #define	CONFIG_8xx_CONS_SMC1	1	/* Console is on SMC1		*/
diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 06fa676..d46c2ad 100644
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -52,7 +52,7 @@
 #define CONFIG_VERY_BIG_RAM 1
 #define CONFIG_VERSION_VARIABLE
 
-#define CONFIG_IDENT_STRING " Sandburst Kamino Reference Design"
+#define CONFIG_IDENT_STRING "Sandburst Kamino Reference Design"
 
 /*-----------------------------------------------------------------------
  * Base addresses -- Note these are effective addresses where the
diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index c75a256..9e9eb31 100644
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -118,7 +118,7 @@
 #define CONFIG_VERY_BIG_RAM 1
 #define CONFIG_VERSION_VARIABLE
 
-#define CONFIG_IDENT_STRING " Sandburst Metrobox"
+#define CONFIG_IDENT_STRING "Sandburst Metrobox"
 
 /*-----------------------------------------------------------------------
  * Base addresses -- Note these are effective addresses where the
diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index 3a01292..15a726e 100644
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -57,7 +57,7 @@
 #define	CONFIG_SYS_TEXT_BASE	0x80000000
 
 #undef	CONFIG_WATCHDOG			/* watchdog disabled		*/
-#define	CONFIG_IDENT_STRING " EMK TOP860"
+#define	CONFIG_IDENT_STRING "EMK TOP860"
 
 /*-----------------------------------------------------------------------
  * CLOCK settings
diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index 504ad96..21cae7c 100644
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -32,7 +32,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_IDENT_STRING     " $Name:  $"
+#define CONFIG_IDENT_STRING     "$Name:  $"
 
 #define CONFIG_405EP		1	/* This is a PPC405 CPU		*/
 #define CONFIG_4xx		1	/* ...member of PPC4xx family	*/
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h
index 1468197..e069b60 100644
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -34,7 +34,7 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME		dlvsion-10g
-#define CONFIG_IDENT_STRING	" dlvision-10g 0.02"
+#define CONFIG_IDENT_STRING	"dlvision-10g 0.02"
 #include "amcc-common.h"
 
 #define CONFIG_BOARD_EARLY_INIT_F	/* call board_early_init_f */
diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index c490ff6..4342ef3 100644
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -34,7 +34,7 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME		dlvision
-#define CONFIG_IDENT_STRING	" dlvision 0.01"
+#define CONFIG_IDENT_STRING	"dlvision 0.01"
 #include "amcc-common.h"
 
 #define CONFIG_BOARD_EARLY_INIT_F	/* call board_early_init_f */
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index b08de4a..7e83c07 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -34,7 +34,7 @@
 #define USE_920T_MMU
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_IDENT_STRING	" on EB+CPUx9K2"
+#define CONFIG_IDENT_STRING	"on EB+CPUx9K2"
 
 #include <asm/hardware.h>	/* needed for port definitions */
 
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 88d32b2..8ce2905 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -32,7 +32,7 @@
  * Version number information
  */
 
-#define CONFIG_IDENT_STRING	" EDMiniV2"
+#define CONFIG_IDENT_STRING	"EDMiniV2"
 
 /*
  * High Level Configuration Options (easy to change)
diff --git a/include/configs/intip.h b/include/configs/intip.h
index 92b65af..5c56af8 100644
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -37,10 +37,10 @@
 #define CONFIG_460EX		1	/* Specific PPC460EX		*/
 #ifdef CONFIG_DEVCONCENTER
 #define CONFIG_HOSTNAME		devconcenter
-#define CONFIG_IDENT_STRING	" devconcenter 0.05"
+#define CONFIG_IDENT_STRING	"devconcenter 0.05"
 #else
 #define CONFIG_HOSTNAME		intip
-#define CONFIG_IDENT_STRING	" intip 0.05"
+#define CONFIG_IDENT_STRING	"intip 0.05"
 #endif
 #define CONFIG_440		1
 #define CONFIG_4xx		1	/* ... PPC4xx family */
diff --git a/include/configs/io.h b/include/configs/io.h
index 9d2a87d..479ce08 100644
--- a/include/configs/io.h
+++ b/include/configs/io.h
@@ -34,7 +34,7 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME		io
-#define CONFIG_IDENT_STRING	" io 0.04"
+#define CONFIG_IDENT_STRING	"io 0.04"
 #include "amcc-common.h"
 
 #define CONFIG_BOARD_EARLY_INIT_F	/* call board_early_init_f */
diff --git a/include/configs/io64.h b/include/configs/io64.h
index 51b2dd1..61b136c 100644
--- a/include/configs/io64.h
+++ b/include/configs/io64.h
@@ -53,7 +53,7 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME		io64
-#define CONFIG_IDENT_STRING	" io64 0.01"
+#define CONFIG_IDENT_STRING	"io64 0.01"
 #include "amcc-common.h"
 
 #define CONFIG_BOARD_EARLY_INIT_F
diff --git a/include/configs/iocon.h b/include/configs/iocon.h
index 9fcc643..ee661ad 100644
--- a/include/configs/iocon.h
+++ b/include/configs/iocon.h
@@ -34,7 +34,7 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME		iocon
-#define CONFIG_IDENT_STRING	" iocon 0.03"
+#define CONFIG_IDENT_STRING	"iocon 0.03"
 #include "amcc-common.h"
 
 #define CONFIG_BOARD_EARLY_INIT_F	/* call board_early_init_f */
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 6cbc752..77705bd 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -23,16 +23,16 @@
  */
 #if defined(CONFIG_INETSPACE_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_INETSPACE_V2
-#define CONFIG_IDENT_STRING		" IS v2"
+#define CONFIG_IDENT_STRING		"IS v2"
 #elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_V2
-#define CONFIG_IDENT_STRING		" NS v2"
+#define CONFIG_IDENT_STRING		"NS v2"
 #elif defined(CONFIG_NETSPACE_MAX_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_NETSPACE_MAX_V2
-#define CONFIG_IDENT_STRING		" NS Max v2"
+#define CONFIG_IDENT_STRING		"NS Max v2"
 #elif defined(CONFIG_NET2BIG_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
-#define CONFIG_IDENT_STRING		" 2Big v2"
+#define CONFIG_IDENT_STRING		"2Big v2"
 #else
 #error "Unknown board"
 #endif
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index cdf6827..c933f4b 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -84,11 +84,11 @@
  */
 
 #if defined(CONFIG_HLAN) || defined(CONFIG_LAN)
-#define CONFIG_IDENT_STRING		" LinkStation / KuroBox"
+#define CONFIG_IDENT_STRING		"LinkStation / KuroBox"
 #elif defined(CONFIG_HGLAN)
-#define CONFIG_IDENT_STRING		" LinkStation HG / KuroBox HG"
+#define CONFIG_IDENT_STRING		"LinkStation HG / KuroBox HG"
 #elif defined(CONFIG_HTGL)
-#define CONFIG_IDENT_STRING		" TeraStation"
+#define CONFIG_IDENT_STRING		"TeraStation"
 #else
 #error No LinkStation model defined
 #endif
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index a6f2864..06ffd48 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -27,7 +27,7 @@
 /*
  * Liebherr extra version info
  */
-#define CONFIG_IDENT_STRING	" - v2.0"
+#define CONFIG_IDENT_STRING	"- v2.0"
 
 /*
  * High Level Configuration Options
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 3e73775..f999af0 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -45,7 +45,7 @@
 #define	CONFIG_SYS_TEXT_BASE	0xFF000000
 
 #define CONFIG_SYS_BOARD_NAME		"MPC7448 HPC II"
-#define CONFIG_IDENT_STRING	" Freescale MPC7448 HPC II"
+#define CONFIG_IDENT_STRING	"Freescale MPC7448 HPC II"
 
 #define CONFIG_SYS_OCN_CLK		133000000	/* 133 MHz */
 #define CONFIG_SYS_BUS_CLK		133000000
diff --git a/include/configs/origen.h b/include/configs/origen.h
index cd502d1..d16de4b 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -139,7 +139,7 @@
 /* FLASH and environment organization */
 #define CONFIG_SYS_NO_FLASH		1
 #undef CONFIG_CMD_IMLS
-#define CONFIG_IDENT_STRING		" for ORIGEN"
+#define CONFIG_IDENT_STRING		"for ORIGEN"
 
 #ifdef CONFIG_USE_IRQ
 #define CONFIG_STACKSIZE_IRQ		(4*1024)	/* IRQ stack */
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index 4d0b7b2..760c297 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -206,7 +206,7 @@
  * SMDK6400 board specific data
  */
 
-#define CONFIG_IDENT_STRING	" for SMDK6400"
+#define CONFIG_IDENT_STRING	"for SMDK6400"
 
 /* base address for uboot */
 #define CONFIG_SYS_PHY_UBOOT_BASE	(CONFIG_SYS_SDRAM_BASE + 0x07e00000)
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 6663629..f22cee2 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -206,7 +206,7 @@
 #define CONFIG_SYS_NO_FLASH		1
 
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* 256 KiB */
-#define CONFIG_IDENT_STRING		" for SMDKC100"
+#define CONFIG_IDENT_STRING		"for SMDKC100"
 
 #if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000)
 #define CONFIG_ENABLE_MMU
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 93c25da..66ff3e0 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -136,7 +136,7 @@
 /* FLASH and environment organization */
 #define CONFIG_SYS_NO_FLASH		1
 #undef	CONFIG_CMD_IMLS
-#define CONFIG_IDENT_STRING		" for SMDKC210/V310"
+#define CONFIG_IDENT_STRING		"for SMDKC210/V310"
 
 #ifdef CONFIG_USE_IRQ
 #define CONFIG_STACKSIZE_IRQ		(4*1024)	/* IRQ stack */
diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 1e59ef3..ea458dd 100644
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -54,7 +54,7 @@
 
 #define DEBUG				1
 
-#define CONFIG_IDENT_STRING     " [UTX5] "
+#define CONFIG_IDENT_STRING     "[UTX5]"
 
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		57600
diff --git a/include/version.h b/include/version.h
index c908bd3..ac5a39a 100644
--- a/include/version.h
+++ b/include/version.h
@@ -35,7 +35,7 @@
 #endif
 
 #define U_BOOT_VERSION_STRING U_BOOT_VERSION " (" U_BOOT_DATE " - " \
-	U_BOOT_TIME ")" CONFIG_IDENT_STRING
+	U_BOOT_TIME ") " CONFIG_IDENT_STRING
 
 #ifndef __ASSEMBLY__
 extern const char version_string[];

More information about the U-Boot mailing list