summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-04 17:50:34 -0500
committerTom Rini <trini@konsulko.com>2015-12-04 17:50:34 -0500
commit9eed48c8bec98425dbd995dd72c40e9ad7a8c26b (patch)
tree187374b183ff589b43b7f8706829500ad2664dc2 /include/configs
parenta85670e40da1ef4f299effb73c36e48d39d50106 (diff)
parent7a4fb11b85939b47738283c3a7ae7f461468e274 (diff)
Merge branch 'master' of http://git.denx.de/u-boot-sparc
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/gr_cpci_ax2000.h8
-rw-r--r--include/configs/gr_ep2s60.h8
-rw-r--r--include/configs/gr_xc3s_1500.h8
-rw-r--r--include/configs/grsim.h8
-rw-r--r--include/configs/grsim_leon2.h12
5 files changed, 22 insertions, 22 deletions
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 5bbf1aaae8..c3b1729326 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -14,6 +14,9 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
/*
* High Level Configuration Options
* (easy to change)
@@ -42,9 +45,6 @@
/* CPU / AMBA BUS configuration */
#define CONFIG_SYS_CLK_FREQ 20000000 /* 20MHz */
-/* Number of SPARC register windows */
-#define CONFIG_SYS_SPARC_NWINDOWS 8
-
/*
* Serial console configuration
*/
@@ -344,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 b55ca77a87..45163edd8d 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -15,6 +15,9 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
/*
* High Level Configuration Options
* (easy to change)
@@ -26,9 +29,6 @@
/* CPU / AMBA BUS configuration */
#define CONFIG_SYS_CLK_FREQ 96000000 /* 96MHz */
-/* Number of SPARC register windows */
-#define CONFIG_SYS_SPARC_NWINDOWS 8
-
/* Define this is the GR-2S60-MEZZ mezzanine is available and you
* want to use the USB and GRETH functionality of the board
*/
@@ -314,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 d086b694c2..f675b75843 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -13,6 +13,9 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
/*
* High Level Configuration Options
* (easy to change)
@@ -23,9 +26,6 @@
/* CPU / AMBA BUS configuration */
#define CONFIG_SYS_CLK_FREQ 40000000 /* 40MHz */
-/* Number of SPARC register windows */
-#define CONFIG_SYS_SPARC_NWINDOWS 8
-
/*
* Serial console configuration
*/
@@ -276,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 e1f7dc3bf6..47c357322d 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -13,6 +13,9 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
/*
* High Level Configuration Options
* (easy to change)
@@ -34,9 +37,6 @@
/* CPU / AMBA BUS configuration */
#define CONFIG_SYS_CLK_FREQ 40000000 /* 40MHz */
-/* Number of SPARC register windows */
-#define CONFIG_SYS_SPARC_NWINDOWS 8
-
/*
* Serial console configuration
*/
@@ -295,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 83fd7fae50..0a5292e9fd 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -3,8 +3,8 @@
* (C) Copyright 2003-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * (C) Copyright 2007
- * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com.
+ * (C) Copyright 2007, 2015
+ * Daniel Hellstrom, Cobham Gaisler, daniel@gaisler.com.
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -12,6 +12,9 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
/*
* High Level Configuration Options
* (easy to change)
@@ -29,9 +32,6 @@
/* CPU / AMBA BUS configuration */
#define CONFIG_SYS_CLK_FREQ 40000000 /* 40MHz */
-/* Number of SPARC register windows */
-#define CONFIG_SYS_SPARC_NWINDOWS 8
-
/*
* Serial console configuration
*/
@@ -291,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 */