diff --git a/rtems/config/4.10/rtems-h8300.bset b/rtems/config/4.10/rtems-h8300.bset
index 8450649..b736cc0 100644
--- a/rtems/config/4.10/rtems-h8300.bset
+++ b/rtems/config/4.10/rtems-h8300.bset
@@ -4,4 +4,21 @@
 
 %define release 1
 %define rtems_arch h8300
-%include 4.10/rtems-defaults.bset
+
+%define with_iconv 0
+
+#
+# The RTEMS base defines.
+#
+%include rtems-base.bset
+
+#
+# Tools configuration.
+#
+4.10/rtems-autotools
+
+devel/expat-2.1.0-1
+tools/rtems-binutils-2.26-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/tools/rtems-binutils-2.26-1.cfg b/rtems/config/tools/rtems-binutils-2.26-1.cfg
index 37ec3d5..78f6522 100644
--- a/rtems/config/tools/rtems-binutils-2.26-1.cfg
+++ b/rtems/config/tools/rtems-binutils-2.26-1.cfg
@@ -9,12 +9,6 @@
 
 %hash sha512 binutils-%{binutils_version}.tar.bz2 e77e1b8dbbcbaf9ac2fae95c4403615808af3be03b2e1d32448cd3a7d32c43273f8bcace3f2de84ec120a982879295673029da306e2885dbf5f990584932cfc7
 
-#
-# Patches for x86_64 and aarch64
-#
-%patch add binutils -p1 %{rtems_binutils_patches}/binutils-2.26-rtems-aarch64-x86_64.patch
-%hash sha512 binutils-2.26-rtems-aarch64-x86_64.patch 2236cc22dda60d5c18a2ab5abc0f44bf487794f7c0899382bf49233e789e1fb34ce28b0f7a85069642f7cc06bd34d7634a441a8d92bf890de57bb89cc398349f
-
 #
 # Enable deterministic archives by default. This will be the default
 # there all tools using this binutils will create deterministic
diff --git a/rtems/config/tools/rtems-gcc-4.4.7-newlib-1.18.0-1.cfg b/rtems/config/tools/rtems-gcc-4.4.7-newlib-1.18.0-1.cfg
index adc8957..4a852a5 100644
--- a/rtems/config/tools/rtems-gcc-4.4.7-newlib-1.18.0-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.4.7-newlib-1.18.0-1.cfg
@@ -21,7 +21,9 @@
 
 %define with_threads 1
 %define with_plugin  0
-%define with_iconv   1
+%ifn %{defined with_iconv}
+ %define with_iconv   1
+%endif
 
 %hash md5 gcc-core-%{gcc_version}.tar.bz2 3bda0831d654964ee152c46fa8d29e46
 %hash md5 gcc-g++-%{gcc_version}.tar.gz 421ba1dfe821f32998b28ee40e71dd37