summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/build.mk1
-rw-r--r--toolchain/Config.in16
2 files changed, 2 insertions, 15 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 2859032d1..f34b08063 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -17,7 +17,6 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_LEAVE_ETC_ALONE=n \
ADK_SIMPLE_NETWORK_CONFIG=n \
ADK_USE_CCACHE=n \
- ADK_TOOLCHAIN_GDB=n \
ADK_PACKAGE_BASE_FILES=y \
ADK_PACKAGE_E2FSCK_STATIC=n \
ADK_PACKAGE_KEXECINIT=n \
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 6f51c2367..d6a578233 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -7,24 +7,12 @@ menu "Toolchain settings"
config ADK_TOOLCHAIN_GDB
prompt "Enable building of the GNU debugger"
boolean
- default y if !ADK_TARGET_SYSTEM_ATMEL_NGW100
- depends on !ADK_TARGET_SYSTEM_ATMEL_NGW100
+ default y
config ADK_TOOLCHAIN_GCC_CXX
prompt "Enable building of G++ (C++ language support in GCC)"
boolean
- default y if !ADK_TARGET_WITH_MULTILIB
-
-#config ADK_TOOLCHAIN_GCC_JAVA
-# prompt "Enable building of GCJ (Java language support in GCC)"
-# boolean
-# select ADK_PACKAGE_LIBGCJ
-# default n
-#
-#config ADK_TOOLCHAIN_GCC_OBJC
-# prompt "Enable building of Objective C compiler"
-# boolean
-# default n
+ default y
config ADK_TOOLCHAIN_GCC_SSP
prompt "Enable Stack Smashing Protection in GCC"