sparc: Add CONFIG_DISPLAY_BOARDINFO variable to all LEON boards

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>

diff --git a/arch/sparc/cpu/leon2/cpu.c b/arch/sparc/cpu/leon2/cpu.c
index 22e63e386978f4c37101a34101b26e56af5ebb4c..d044c3abc72fb592aa3a99ad1c6812bb48d0fbd9 100644 (file)
--- a/arch/sparc/cpu/leon2/cpu.c
+++ b/arch/sparc/cpu/leon2/cpu.c
@@ -22,6 +22,16 @@ int checkcpu(void)
        return 0;
 }
 
+#ifdef CONFIG_DISPLAY_CPUINFO
+
+int print_cpuinfo(void)
+{
+       printf("CPU:   LEON2\n");
+       return 0;
+}
+
+#endif
+
 /* ------------------------------------------------------------------------- */
 
 void cpu_reset(void)

diff --git a/arch/sparc/cpu/leon3/cpu.c b/arch/sparc/cpu/leon3/cpu.c
index d57bf2fc8710955c73484abb039ec04306031cb5..7034be60ec39f4569ddf8e7d027a20538b50c1b4 100644 (file)
--- a/arch/sparc/cpu/leon3/cpu.c
+++ b/arch/sparc/cpu/leon3/cpu.c
@@ -25,6 +25,16 @@ int checkcpu(void)
        return 0;
 }
 
+#ifdef CONFIG_DISPLAY_CPUINFO
+
+int print_cpuinfo(void)
+{
+       printf("CPU:   LEON3\n");
+       return 0;
+}
+
+#endif
+
 /* ------------------------------------------------------------------------- */
 
 void cpu_reset(void)

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index a16f59a8913cc7c665f6bbaf77ace53a209a07b3..c3b1729326ed037784f13e11dc42e61ee2f1276d 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -15,6 +15,7 @@
 #define __CONFIG_H__
 
 #define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
 
 /*
  * High Level Configuration Options
@@ -343,7 +344,7 @@
 #undef CONFIG_SYS_GRLIB_GAISLER_DDR2SPA1
 
 /* Identification string */
-#define CONFIG_IDENT_STRING "GAISLER LEON3 GR-CPCI-AX2000"
+#define CONFIG_IDENT_STRING " Gaisler LEON3 GR-CPCI-AX2000"
 
 /* default kernel command line */
 #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0"

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index f472179dd6896a7e816819e924dfbd730604665f..45163edd8dd7551dd39b6b50b6eeeebe43b6607b 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -16,6 +16,7 @@
 #define __CONFIG_H__
 
 #define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
 
 /*
  * High Level Configuration Options
@@ -313,7 +314,7 @@
 #undef CONFIG_SYS_GRLIB_GAISLER_DDR2SPA1
 
 /* Identification string */
-#define CONFIG_IDENT_STRING "GAISLER LEON3 EP2S60"
+#define CONFIG_IDENT_STRING " Gaisler LEON3 EP2S60"
 
 /* default kernel command line */
 #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0"

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 8598ac18813c88d98c2fc5107894a7efa1990f2f..f675b7584393bb66471f3dc05a251f91810376d8 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -14,6 +14,7 @@
 #define __CONFIG_H__
 
 #define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
 
 /*
  * High Level Configuration Options
@@ -275,7 +276,7 @@
 #undef CONFIG_SYS_GRLIB_GAISLER_DDR2SPA1
 
 /* Identification string */
-#define CONFIG_IDENT_STRING "GAISLER LEON3 GR-XC3S-1500"
+#define CONFIG_IDENT_STRING " Gaisler LEON3 GR-XC3S-1500"
 
 /* default kernel command line */
 #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0"

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index e280dee9e9a5a0b09fe7f596cef3fe59a42d23c0..47c357322df8d261fdb3ee0a7fc81782a9214a64 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -14,6 +14,7 @@
 #define __CONFIG_H__
 
 #define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
 
 /*
  * High Level Configuration Options
@@ -294,7 +295,7 @@
 /* default kernel command line */
 #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0"
 
-#define CONFIG_IDENT_STRING "Gaisler GRSIM"
+#define CONFIG_IDENT_STRING " Gaisler GRSIM"
 
 /* TSIM command:
  * $ ./tsim-leon3 -mmu -cas

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 2f7a5628f14bf7718695f7c7bb602127a83ad8e2..0a5292e9fdb02a53e3a4d7c6626107b4edce5aab 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -13,6 +13,7 @@
 #define __CONFIG_H__
 
 #define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
 
 /*
  * High Level Configuration Options
@@ -290,6 +291,6 @@
 /* default kernel command line */
 #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0"
 
-#define CONFIG_IDENT_STRING "Gaisler GRSIM LEON2"
+#define CONFIG_IDENT_STRING " Gaisler GRSIM LEON2"
 
 #endif                         /* __CONFIG_H */