diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm
index 936f7618..8c7a52e1 100644
--- a/build/buildtools/commondefs.firm
+++ b/build/buildtools/commondefs.firm
@@ -36,25 +36,29 @@ SPACE 		?= $(EMPTY) $(EMPTY)
 #
 # CodeGen Target
 #
-#	FIRM_PLATFORM  = [BB/EVA/TS]
-#	FIRM_MEMSIZE   = [16M/32M]
-#	FIRM_CODEGEN	= [ARM/THUMB]
-#	FIRM_PROC      = [ARM9/ARM7]
+#	FIRM_PLATFORM   = [BB/EVA/TS]
+#	FIRM_MEMSIZE    = [16M/32M]
+#	FIRM_CODEGEN    = [ARM/THUMB]
+#	FIRM_PROC       = [ARM9/ARM7]
+#	FIRM_ARCHGEN    = [LIMITED/HYBRID/ALL]
 #
-#	FIRM_TARGET		= [FIRM/GCDFIRM/APP]
+#	FIRM_TARGET	= [FIRM/GCDFIRM/APP]
 #
 
 FIRM_PLATFORM		?= TS
 FIRM_MEMSIZE		?= 16M
 FIRM_CODEGEN		?= ARM
-FIRM_PROC			?= ARM9
-FIRM_TARGET			?= APP
+FIRM_PROC		?= ARM9
+FIRM_ARCHGEN		?= LIMITED
+
+FIRM_TARGET		?= APP
 
 # replace TwlSDK
 TWL_PLATFORM		= $(FIRM_PLATFORM)
-TWL_MEMSIZE			= $(FIRM_MEMSIZE)
-TWL_CODEGEN			= $(FIRM_CODEGEN)
-TWL_PROC			= $(FIRM_PROC)
+TWL_MEMSIZE		= $(FIRM_MEMSIZE)
+TWL_CODEGEN		= $(FIRM_CODEGEN)
+TWL_PROC		= $(FIRM_PROC)
+TWL_ARCHGEN		= $(FIRM_ARCHGEN)
 
 # replace NitroSDK
 ifndef	CODEGEN_PROC