18 files changed, 52 insertions, 270 deletions
diff --git a/rtems/config/4.10/rtems-arm.bset b/rtems/config/4.10/rtems-arm.bset
index 24a17f4..35874db 100644
--- a/rtems/config/4.10/rtems-arm.bset
+++ b/rtems/config/4.10/rtems-arm.bset
@@ -3,21 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch arm
-
-#
-# The RTEMS base defines.
-#
-%include rtems-base.bset
-
-#
-# Tools configuration.
-#
-4.10/rtems-autotools
-
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-avr.bset b/rtems/config/4.10/rtems-avr.bset
index cbe0463..369a513 100644
--- a/rtems/config/4.10/rtems-avr.bset
+++ b/rtems/config/4.10/rtems-avr.bset
@@ -2,15 +2,6 @@
 # Tools Set for RTEMS AVR 4.10 Stable
 #
 
-%define release 1
-
-%define rtems_arch avr
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-
 #
 # Disable building a C++ compiler.
 #  configure: error: unable to detect exception model
@@ -18,11 +9,6 @@
 %define enable_cxx 0
 %define rtems_cxx  0
 
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%define release 1
+%define rtems_arch arm
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-bfin.bset b/rtems/config/4.10/rtems-bfin.bset
index 24887d1..50d40f7 100644
--- a/rtems/config/4.10/rtems-bfin.bset
+++ b/rtems/config/4.10/rtems-bfin.bset
@@ -2,31 +2,11 @@
 # Tools Set for RTEMS BFIN 4.10 Stable
 #
 
-%define release 1
-
-%define rtems_arch bfin
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-
-#
-# The RTEMS 4.11 BSP to build and test
-#
-%define rtems_bsps      all
-%define rtems_test_bsps none
-
 #
 # GDB simulator fix for the sed command.
 #
 %patch add gdb %{rtems_gdb_patches}/bfin/gdb-7.3.1-bfin-sim-fix-sed-20130319.diff
 
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%define release 1
+%define rtems_arch bfin
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-defaults.bset b/rtems/config/4.10/rtems-defaults.bset
new file mode 100644
index 0000000..eaa6fa5
--- /dev/null
+++ b/rtems/config/4.10/rtems-defaults.bset
@@ -0,0 +1,19 @@
+#
+# Tools Set for RTEMS 4.10 Stable
+#
+
+#
+# The RTEMS base defines.
+#
+%include rtems-base.bset
+
+#
+# Tools configuration.
+#
+4.10/rtems-autotools
+
+devel/expat-2.1.0-1
+tools/rtems-binutils-2.20.1-1
+tools/rtems-gcc-4.4.7-newlib-1.18.0-1
+tools/rtems-gdb-7.11-1
+tools/rtems-kernel-4.10
diff --git a/rtems/config/4.10/rtems-h8300.bset b/rtems/config/4.10/rtems-h8300.bset
index 45d16e0..8450649 100644
--- a/rtems/config/4.10/rtems-h8300.bset
+++ b/rtems/config/4.10/rtems-h8300.bset
@@ -3,25 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch h8300
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-
-#
-# The RTEMS 4.11 BSP to build and test
-#
-%define rtems_bsps      all
-%define rtems_test_bsps none
-
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-i386.bset b/rtems/config/4.10/rtems-i386.bset
index fe80e49..e3e0cad 100644
--- a/rtems/config/4.10/rtems-i386.bset
+++ b/rtems/config/4.10/rtems-i386.bset
@@ -3,29 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch i386
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-
-#
-# The RTEMS 4.11 BSP to build and test
-#
-# For automated testing on Qemu, pc386 should be configured with:
-#    - USE_COM1_AS_CONSOLE=1
-#    - BSP_PRESS_KEY_FOR_RESET=0
-#    - BSP_RESET_BOARD_AT_EXIT=1
-%define rtems_bsps      all
-%define rtems_test_bsps none
-
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-lm32.bset b/rtems/config/4.10/rtems-lm32.bset
index e9fbab7..c227def 100644
--- a/rtems/config/4.10/rtems-lm32.bset
+++ b/rtems/config/4.10/rtems-lm32.bset
@@ -3,25 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch lm32
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-
-#
-# The RTEMS 4.11 BSP to build and test
-#
-%define rtems_bsps      all
-%define rtems_test_bsps lm32_evr
-
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-m32c.bset b/rtems/config/4.10/rtems-m32c.bset
index a01e9d5..9a2eaeb 100644
--- a/rtems/config/4.10/rtems-m32c.bset
+++ b/rtems/config/4.10/rtems-m32c.bset
@@ -2,26 +2,12 @@
 # Tools Set for RTEMS M32C 4.10 Stable
 #
 
-%define release 1
-
-%define rtems_arch m32c
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-
 #
 # Disable building a C++ compiler.
 #
 %define enable_cxx 0
 %define rtems_cxx  0
 
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%define release 1
+%define rtems_arch m32c
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-m32r.bset b/rtems/config/4.10/rtems-m32r.bset
index 7320237..a13bfcb 100644
--- a/rtems/config/4.10/rtems-m32r.bset
+++ b/rtems/config/4.10/rtems-m32r.bset
@@ -3,19 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch m32r
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-m68k.bset b/rtems/config/4.10/rtems-m68k.bset
index c6b4582..8f2071c 100644
--- a/rtems/config/4.10/rtems-m68k.bset
+++ b/rtems/config/4.10/rtems-m68k.bset
@@ -3,21 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch m68k
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-%define rtems_bsps      all
-%define rtems_test_bsps none
-
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-mips.bset b/rtems/config/4.10/rtems-mips.bset
index 39584da..e610abc 100644
--- a/rtems/config/4.10/rtems-mips.bset
+++ b/rtems/config/4.10/rtems-mips.bset
@@ -3,22 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch mips
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-
-%define rtems_bsps      all
-%define rtems_test_bsps jmr3904
-
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-nios2.bset b/rtems/config/4.10/rtems-nios2.bset
index e62eb09..179b9dc 100644
--- a/rtems/config/4.10/rtems-nios2.bset
+++ b/rtems/config/4.10/rtems-nios2.bset
@@ -5,17 +5,17 @@
 #
 
 %define release 1
-
 %define rtems_arch nios2
 
 #
-# The RTEMS 4.10 base defines.
+# The RTEMS base defines.
 #
-%include rtems-4.10-base.bset
-
+%include rtems-base.bset
 
-%define rtems_bsps      all
-%define rtems_test_bsps none
+#
+# Tools configuration.
+#
+4.10/rtems-autotools
 
 #
 # Tools configuration.
diff --git a/rtems/config/4.10/rtems-powerpc.bset b/rtems/config/4.10/rtems-powerpc.bset
index ecea464..711d1fc 100644
--- a/rtems/config/4.10/rtems-powerpc.bset
+++ b/rtems/config/4.10/rtems-powerpc.bset
@@ -3,20 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch powerpc
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-%define rtems_bsps      all
-%define rtems_test_bsps psim
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-sh.bset b/rtems/config/4.10/rtems-sh.bset
index 73c1579..5efc007 100644
--- a/rtems/config/4.10/rtems-sh.bset
+++ b/rtems/config/4.10/rtems-sh.bset
@@ -3,20 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch sh
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-%define rtems_bsps      all
-%define rtems_test_bsps simsh1
-
-# Tools configurationt
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/4.10/rtems-sparc.bset b/rtems/config/4.10/rtems-sparc.bset
index b3ffc98..4917c4d 100644
--- a/rtems/config/4.10/rtems-sparc.bset
+++ b/rtems/config/4.10/rtems-sparc.bset
@@ -3,20 +3,5 @@
 #
 
 %define release 1
-
 %define rtems_arch sparc
-
-#
-# The RTEMS 4.10 base defines.
-#
-%include rtems-4.10-base.bset
-%define rtems_bsps      all
-%define rtems_test_bsps sis
-#
-# Tools configuration.
-#
-devel/expat-2.1.0-1
-tools/rtems-binutils-2.20.1-1
-tools/rtems-gcc-4.4.7-newlib-1.18.0-1
-tools/rtems-gdb-7.3.1-1
-tools/rtems-kernel-4.10.2
+%include 4.10/rtems-defaults.bset
diff --git a/rtems/config/tools/rtems-gdb-7.9-1.cfg b/rtems/config/tools/rtems-gdb-7.9-1.cfg
index 81e5a27..87db312 100644
--- a/rtems/config/tools/rtems-gdb-7.9-1.cfg
+++ b/rtems/config/tools/rtems-gdb-7.9-1.cfg
@@ -17,20 +17,6 @@
 %patch add gdb %{rtems_gdb_patches}/gdb-sim-cgen-inline.diff
 %hash  md5 gdb-sim-cgen-inline.diff e6f7d6d7295cdba99f51aab514ea9778
 
-#
-# Fix building on Windows. Download the patches from GDB git repo.
-#
-#%define sourceware_binutils_gdb http://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch
-#%patch add gdb %{sourceware_binutils_gdb};h=63413d85873c450fa4ed2494f21fb1a65bdaf554
-#%patch add gdb %{sourceware_binutils_gdb};h=03b7960334677d33ee7410f2c819f78820c32024
-
-#
-# aarch64 and x86_64 support.
-#
-%patch add gdb -p1 %{rtems_gdb_patches}/gdb-7.9-aarch64-x86_64.patch
-%hash md5 gdb-7.9-aarch64-x86_64.patch e809ccb4fffa0188cb985512695e0f48
-
-
 %if %{_build_os} == freebsd
  %patch add gdb -p0 %{rtems_gdb_patches}/patch-gdb-python-python-config.py
  %hash  md5 patch-gdb-python-python-config.py c0260fcca4c1a5509635049c0094eee3
diff --git a/rtems/config/tools/rtems-kernel-4.10.2.cfg b/rtems/config/tools/rtems-kernel-4.10.2.cfg
deleted file mode 100644
index c12f0ea..0000000
--- a/rtems/config/tools/rtems-kernel-4.10.2.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# RTEMS 4.10.2
-#
-
-%define rtems_kernel_compression bz2
-%hash md5 rtems-%{rtems_version}.tar.bz2 158566d0f1330d4eaba5a60e757d3dd0
-
-#
-# The RTEMS build instructions. We use 4.xx Release 1.
-#
-%include tools/rtems-kernel-4-1.cfg
diff --git a/rtems/config/tools/rtems-kernel-4.10.cfg b/rtems/config/tools/rtems-kernel-4.10.cfg
new file mode 100644
index 0000000..94caacb
--- /dev/null
+++ b/rtems/config/tools/rtems-kernel-4.10.cfg
@@ -0,0 +1,8 @@
+#
+# RTEMS 4.10
+#
+
+#
+# The RTEMS build instructions. We use 4.xx Release 1.
+#
+%include tools/rtems-kernel-4-1.cfg