16 files changed, 28 insertions, 67 deletions
diff --git a/rtems/config/6/rtems-aarch64.bset b/rtems/config/6/rtems-aarch64.bset
index e3c91af..99051eb 100644
--- a/rtems/config/6/rtems-aarch64.bset
+++ b/rtems/config/6/rtems-aarch64.bset
@@ -1,4 +1,5 @@
 %define release 1
 %define rtems_arch aarch64
 %define with_libgomp
+%define with_newlib_tls
 %include 6/rtems-default.bset
diff --git a/rtems/config/6/rtems-arm.bset b/rtems/config/6/rtems-arm.bset
index 425d66b..c4e6613 100644
--- a/rtems/config/6/rtems-arm.bset
+++ b/rtems/config/6/rtems-arm.bset
@@ -1,4 +1,5 @@
 %define release 1
 %define rtems_arch arm
 %define with_libgomp
+%define with_newlib_tls
 %include 6/rtems-default.bset
diff --git a/rtems/config/6/rtems-autotools-base.bset b/rtems/config/6/rtems-autotools-base.bset
deleted file mode 100644
index c6819c1..0000000
--- a/rtems/config/6/rtems-autotools-base.bset
+++ /dev/null
@@ -1,9 +0,0 @@
-%define release 1
-%define rtems_arch none
-
-%include 6/rtems-base.bset
-
-package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
-
-tools/rtems-autoconf-2.69-1
-tools/rtems-automake-1.12.6-1
diff --git a/rtems/config/6/rtems-autotools-internal.bset b/rtems/config/6/rtems-autotools-internal.bset
deleted file mode 100644
index 19d2f19..0000000
--- a/rtems/config/6/rtems-autotools-internal.bset
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Do not use via the command line.
-#
-
-%define _internal_autotools yes
-%define _disable_collecting yes
-%define _disable_packaging  yes
-%define _disable_reporting  yes
-%define _disable_installing yes
-
-%include 6/rtems-autotools-base.bset
diff --git a/rtems/config/6/rtems-autotools.bset b/rtems/config/6/rtems-autotools.bset
deleted file mode 100644
index e57d25d..0000000
--- a/rtems/config/6/rtems-autotools.bset
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Autoconf and automake are not relocatable and cannot be cross-compiled.
-# RTEMS uses autoconf and automake and building RTEMS in the RSB requires
-# bootstrapping and this requires a current autoconf and automake. The RSB
-# provides to support by:
-#
-#  1. Building and installing autoconf and automake with a prefix to a
-#     temporary internal path.
-#  2. Using the temporary internal build, build and install another copy
-#     using the final prefix location.
-#
-
-#
-# A magic internal path that would break if changes in the defaults.mc
-# macro file are made.
-#
-%define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
-
-#
-# Disable emailing reports of this building for RTEMS.
-#
-%define mail_disable
-
-6/rtems-autotools-internal
-6/rtems-autotools-base
diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset
index 1b60066..2d51c50 100644
--- a/rtems/config/6/rtems-default.bset
+++ b/rtems/config/6/rtems-default.bset
@@ -3,17 +3,18 @@
 #
 %include 6/rtems-base.bset
 
-6/rtems-autotools
-
 #
-# Build gdb first to raise the Python install error as early as possible.
-# GDB needs expat so it needs to be built before.
+# Default RTEMS build. Override on the command line to the
+# the RSB. For example to test the latest version of gcc use:
 #
+#  --with-rtems-gcc=tools/rtems-gcc-head-newlib-head
+#
+%defineifnot with_rtems_dtc      devel/dtc-1.6.1-1
+%defineifnot with_rtems_expat    devel/expat-2.5.0-1
+%defineifnot with_rtems_gmp      devel/gmp-6.3.0
+%defineifnot with_rtems_gdb      tools/rtems-gdb-13.2
+%defineifnot with_rtems_binutils tools/rtems-binutils-2.41
+%defineifnot with_rtems_gcc      tools/rtems-gcc-13-newlib-head
+%defineifnot with_rtems_tools    tools/rtems-tools-6
 
-devel/expat-2.1.0-1
-devel/gmp-6.1.0
-tools/rtems-gdb-10
-
-tools/rtems-binutils-2.36
-tools/rtems-gcc-10-newlib-head
-tools/rtems-tools-6
+tools/rtems-default-tools.bset
diff --git a/rtems/config/6/rtems-microblaze.bset b/rtems/config/6/rtems-microblaze.bset
index 4b12899..f17c59d 100644
--- a/rtems/config/6/rtems-microblaze.bset
+++ b/rtems/config/6/rtems-microblaze.bset
@@ -6,18 +6,14 @@
 #
 %include 6/rtems-base.bset
 
-6/rtems-autotools
-
-devel/dtc-1.6.0-1
-
 #
 # Build gdb first to raise the Python install error as early as possible.
 # GDB needs expat so it needs to be built before.
 #
 
-devel/expat-2.1.0-1
-devel/gmp-6.1.0
-tools/rtems-gdb-10
+devel/expat-2.5.0-1
+devel/gmp-6.2.1
+tools/rtems-gdb-13.2
 
 tools/rtems-xilinx-binutils-2.36
 tools/rtems-xilinx-gcc-10-newlib-head
diff --git a/rtems/config/6/rtems-mips.bset b/rtems/config/6/rtems-mips.bset
index 370e5ea..6289172 100644
--- a/rtems/config/6/rtems-mips.bset
+++ b/rtems/config/6/rtems-mips.bset
@@ -3,4 +3,4 @@
 %define gdb-sim-options --enable-sim-hardware
 %define win32-gdb-disable-sim
 %include 6/rtems-default.bset
-tools/rtems-mipstx39-gdb-head
+tools/rtems-mipstx39-gdb
diff --git a/rtems/config/6/rtems-moxie.bset b/rtems/config/6/rtems-moxie.bset
index a191c5d..c86777e 100644
--- a/rtems/config/6/rtems-moxie.bset
+++ b/rtems/config/6/rtems-moxie.bset
@@ -2,5 +2,4 @@
 %define rtems_arch moxie
 %define win32-gdb-disable-sim
 %define with_libgomp
-devel/dtc-1.6.0-1
 %include 6/rtems-default.bset
diff --git a/rtems/config/6/rtems-nios2.bset b/rtems/config/6/rtems-nios2.bset
index 522eff5..d45024d 100644
--- a/rtems/config/6/rtems-nios2.bset
+++ b/rtems/config/6/rtems-nios2.bset
@@ -1,3 +1,4 @@
 %define release 1
 %define rtems_arch nios2
+%define with_newlib_tls
 %include 6/rtems-default.bset
diff --git a/rtems/config/6/rtems-packages.bset b/rtems/config/6/rtems-packages.bset
index edc7e6b..1f9d71d 100644
--- a/rtems/config/6/rtems-packages.bset
+++ b/rtems/config/6/rtems-packages.bset
@@ -20,5 +20,4 @@ graphics/t1lib
 # Networking
 #
 ftp/curl
-net/lwip
 net/protobuf
diff --git a/rtems/config/6/rtems-powerpc.bset b/rtems/config/6/rtems-powerpc.bset
index c19327a..3309057 100644
--- a/rtems/config/6/rtems-powerpc.bset
+++ b/rtems/config/6/rtems-powerpc.bset
@@ -1,4 +1,5 @@
 %define release 1
 %define rtems_arch powerpc
 %define with_libgomp
+%define with_newlib_tls
 %include 6/rtems-default.bset
diff --git a/rtems/config/6/rtems-riscv.bset b/rtems/config/6/rtems-riscv.bset
index ad7cb5b..ec1ab3a 100644
--- a/rtems/config/6/rtems-riscv.bset
+++ b/rtems/config/6/rtems-riscv.bset
@@ -1,5 +1,6 @@
 %define release 1
 %define rtems_arch riscv
 %define with_libgomp
+%define with_newlib_tls
 %include 6/rtems-default.bset
 devel/sis-2-1
diff --git a/rtems/config/6/rtems-sparc.bset b/rtems/config/6/rtems-sparc.bset
index 48d152d..809d47e 100644
--- a/rtems/config/6/rtems-sparc.bset
+++ b/rtems/config/6/rtems-sparc.bset
@@ -1,6 +1,7 @@
 %define release 1
 %define rtems_arch sparc
 %define with_libgomp
+%define with_newlib_tls
 %define gdb-disable-sim 1
 %include 6/rtems-default.bset
 devel/sis-2-1
diff --git a/rtems/config/6/rtems-tools.bset b/rtems/config/6/rtems-tools.bset
index d0be01a..20e2199 100644
--- a/rtems/config/6/rtems-tools.bset
+++ b/rtems/config/6/rtems-tools.bset
@@ -14,4 +14,4 @@
 #
 %include rtems-base.bset
 
-tools/rtems-tools-6-1
+tools/rtems-tools-6
diff --git a/rtems/config/6/rtems-x86_64.bset b/rtems/config/6/rtems-x86_64.bset
index dbfc9e6..088c9f5 100644
--- a/rtems/config/6/rtems-x86_64.bset
+++ b/rtems/config/6/rtems-x86_64.bset
@@ -1,4 +1,9 @@
 %define release 1
 %define rtems_arch x86_64
 %define with_libgomp
+%define grub2_platform efi
+%define grub2_target x86_64
+
 %include 6/rtems-default.bset
+
+tools/rtems-grub-2.06