diff --git a/samples/nios2-unknown-elf/crosstool.config b/samples/nios2-unknown-elf/crosstool.config
new file mode 100644
index 00000000..6fe59901
--- /dev/null
+++ b/samples/nios2-unknown-elf/crosstool.config
@@ -0,0 +1,4 @@
+CT_ARCH_nios2=y
+CT_CC_LANG_CXX=y
+CT_DEBUG_gdb=y
+# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/nios2-unknown-elf/reported.by b/samples/nios2-unknown-elf/reported.by
new file mode 100644
index 00000000..43479398
--- /dev/null
+++ b/samples/nios2-unknown-elf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Kirill K. Smirnov"
+reporter_url=""
+reporter_comment="Toolchain for NIOS2 bare metal targets"
diff --git a/scripts/build/arch/nios2.sh b/scripts/build/arch/nios2.sh
index 24c556bf..afd73ec1 100644
--- a/scripts/build/arch/nios2.sh
+++ b/scripts/build/arch/nios2.sh
@@ -1,12 +1,6 @@
 # Compute NIOS2-specific values
 
 CT_DoArchTupleValues() {
-    # gcc ./configure flags
-    CT_ARCH_WITH_ARCH=
-    CT_ARCH_WITH_ABI=
-    CT_ARCH_WITH_CPU=
-    CT_ARCH_WITH_TUNE=
-    CT_ARCH_WITH_FPU=
-    CT_ARCH_WITH_FLOAT=
-    CT_TARGET_SYS=elf
+    # Do nothing here. Default values are sane.
+    :;
 }