diff --git a/presets/j2-fdpic b/presets/j2-fdpic
index e859b1d..bd72ac3 100644
--- a/presets/j2-fdpic
+++ b/presets/j2-fdpic
@@ -1,14 +1,6 @@
-OUTPUT = $(PWD)/output
 TARGET = sh2eb-linux-muslfdpic
-
-BINUTILS_VER = 2.25.1
-GCC_VER = 5.2.0
-
-COMMON_CONFIG += --disable-nls
-COMMON_CONFIG += MAKEINFO=/bin/false
-GCC_CONFIG += --enable-languages=c,c++
-GCC_CONFIG += --disable-libquadmath --disable-decimal-float
-GCC_CONFIG += --disable-multilib
-
 GCC_CONFIG += --with-cpu=mj2
-GCC_CONFIG += --enable-fdpic
+
+# Optional to produce a smaller toolchain:
+# COMMON_CONFIG += --disable-nls
+# GCC_CONFIG += --disable-libquadmath --disable-decimal-float
diff --git a/presets/j2-pie-gplv2 b/presets/j2-pie-gplv2
index cea995a..6e6c7f9 100644
--- a/presets/j2-pie-gplv2
+++ b/presets/j2-pie-gplv2
@@ -1,14 +1,14 @@
-OUTPUT = $(PWD)/output
 TARGET = sh2eb-linux-musl
-
-GCC_VER = 4.2.1
-BINUTILS_VER = 397a64b3
-BINUTILS_SITE = http://landley.net/aboriginal/mirror
-
-COMMON_CONFIG += --disable-nls
-BINUTILS_CONFIG += MAKEINFO=/bin/false
-GCC_CONFIG += --enable-languages=c,c++
-GCC_CONFIG += --disable-libquadmath --disable-decimal-float
-GCC_CONFIG += --disable-multilib
-
+GCC_CONFIG += --with-cpu=mj2
 GCC_CONFIG += --enable-default-pie
+
+# This configuration should be compatible with the old GPLv2 tools,
+# but it is not regularly tested. Uncomment the following and remove
+# the above --with-cpu=mj2 in order to try:
+# GCC_VER = 4.2.1
+# BINUTILS_VER = 397a64b3
+# BINUTILS_SITE = http://landley.net/aboriginal/mirror
+
+# Optional to produce a smaller toolchain:
+# COMMON_CONFIG += --disable-nls
+# GCC_CONFIG += --disable-libquadmath --disable-decimal-float