--- a/packages/redboot/current/cdl/redboot.cdl
+++ b/packages/redboot/current/cdl/redboot.cdl
@@ -79,13 +79,7 @@ cdl_package CYGPKG_REDBOOT {
         default_value 0
         requires CYGPKG_INFRA
         requires CYGPKG_ISOINFRA
-# Someday the tools will handle this
-#        requires { CYGINT_HAL_DEBUG_GDB_STUBS implies CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS }
-#        requires { CYGINT_HAL_DEBUG_GDB_STUBS implies CYGDBG_HAL_DEBUG_GDB_BREAK_SUPPORT }
-#
-        requires { !CYGINT_HAL_DEBUG_GDB_STUBS || CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS }
-        requires { !CYGINT_HAL_DEBUG_GDB_STUBS || CYGDBG_HAL_DEBUG_GDB_BREAK_SUPPORT }
-#
+
         requires ! CYGDBG_HAL_DEBUG_GDB_CTRLC_SUPPORT
         requires ! CYGDBG_HAL_COMMON_INTERRUPTS_SAVE_MINIMUM_CONTEXT
         requires ! CYGDBG_HAL_COMMON_CONTEXT_SAVE_MINIMUM
@@ -95,6 +89,19 @@ cdl_package CYGPKG_REDBOOT {
         requires CYGINT_ISO_STRING_STRFUNCS
         requires CYGINT_REDBOOT_LOAD_METHOD
 
+        cdl_option CYGBLD_BUILD_REDBOOT_WITH_GDB {
+            display       "Include GDB support in RedBoot"
+            no_define
+            default_value 1
+            active_if     CYGINT_HAL_DEBUG_GDB_STUBS
+            requires      CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
+            requires      CYGDBG_HAL_DEBUG_GDB_BREAK_SUPPORT
+            description "
+              RedBoot normally includes support for the GDB debugging protocols.
+              This option allows this to be disabled which may yield a substantial
+              savings in terms of code and memory usage by RedBoot."
+        }
+
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_THREADS {
             display "Threads debugging support"
             no_define