sparc: Move SYS_SPARC_NWINDOWS to Kconfig

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

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 04dc08f41f3072b85739054cdaf7c633fa757806..1d1347b167539d9c8fa90422d5a9e080a7340028 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -12,6 +12,15 @@ config LEON3
        bool
        select LEON
 
+config SYS_SPARC_NWINDOWS
+       int "Number of SPARC register windows"
+       range 2 32
+       default "8"
+       help
+         Specify the number of SPARC register windows implemented by this
+         processor. A SPARC implementation can have from 2 to 32 windows.
+         If unsure, choose 8.
+
 choice
        prompt "Board select"
        optional

diff --git a/arch/sparc/cpu/leon3/start.S b/arch/sparc/cpu/leon3/start.S
index 203114970b2966615d0789c025e9d82656929a89..156601027ac92af7fe046ad1c409b9dc8568b498 100644 (file)
--- a/arch/sparc/cpu/leon3/start.S
+++ b/arch/sparc/cpu/leon3/start.S
@@ -20,6 +20,11 @@
 #define CONFIG_AMBAPP_IOAREA AMBA_DEFAULT_IOAREA
 #endif
 
+/* Default number of SPARC register windows */
+#ifndef CONFIG_SYS_SPARC_NWINDOWS
+#define CONFIG_SYS_SPARC_NWINDOWS 8
+#endif
+
 /* Entry for traps which jump to a programmer-specified trap handler.  */
 #define TRAPR(H)  \
        wr      %g0, 0xfe0, %psr; \

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 5bbf1aaae80903d2b921b9f8b66877934e801072..67538d05a7e77f1733de9d591e3ed36243015a25 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -42,9 +42,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
  */

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index b55ca77a87a510b8a7c60639d6bc355131b63ab1..387596d6b304b6bb84efce3af4c371437b15d52e 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -26,9 +26,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
  */

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index d086b694c208b1f89bd2f2b49ffe89792ba29a0a..5fb800bf2173c07c16881233ef2a735bb00d02a7 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -23,9 +23,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
  */

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index e1f7dc3bf6dc0d7aa2912c37440c79be948672e5..932f330e1e87e1130fcd6d2794c958bde841934d 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -34,9 +34,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
  */

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 83fd7fae5000ed70c469f4adf9ede83f07a24e5e..83022e85421f23adfee8027db85b74c109e9f16b 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -29,9 +29,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
  */