diff --git a/Makefile.inc b/Makefile.inc
index 8389ba4dc3..db4cdee943 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -420,6 +420,10 @@ CFLAGS_common += -Os
 ADAFLAGS_common += -Os
 endif
 
+ifeq ($(CONFIG_DEBUG_ADA_CODE),y)
+ADAFLAGS_common += -gnata
+endif
+
 additional-dirs := $(objutil)/cbfstool $(objutil)/romcc $(objutil)/ifdtool \
 		   $(objutil)/ifdfake $(objutil)/options $(obj)/amdfwtool \
 		   $(objutil)/cbootimage $(objutil)/bimgtool
diff --git a/src/Kconfig b/src/Kconfig
index 91b27ceef5..e337a1a580 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -1135,6 +1135,13 @@ config DEBUG_PRINT_PAGE_TABLES
 	  After the page tables have been built, print them on the debug
 	  console.
 
+config DEBUG_ADA_CODE
+	bool "Compile debug code in Ada sources"
+	default n
+	help
+	  Add the compiler switch `-gnata` to compile code guarded by
+	  `pragma Debug`.
+
 endmenu
 
 # These probably belong somewhere else, but they are needed somewhere.