diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile
index 1d5b2073..e662fca4 100644
--- a/build/components/hyena.TWL/Makefile
+++ b/build/components/hyena.TWL/Makefile
@@ -97,7 +97,6 @@ LINCLUDES		= 	$(ROOT)/build/libraries/spi/ARM7/include \
 SYSMENU_LIBS	=	\
 					libsysmenu_sp$(TWL_LIBSUFFIX).a \
 					libsysmmcu_sp$(TWL_LIBSUFFIX).a \
-					libmbloader_sp$(TWL_LIBSUFFIX).a \
 					libboot_sp$(TWL_LIBSUFFIX).a \
 					libds_sp$(TWL_LIBSUFFIX).a \
 					libhotsw_sp$(TWL_LIBSUFFIX).a \
diff --git a/build/libraries_sysmenu/pm/ARM7/Makefile b/build/libraries_sysmenu/pm/ARM7/Makefile
index 0ce87d05..d2c0b0b5 100644
--- a/build/libraries_sysmenu/pm/ARM7/Makefile
+++ b/build/libraries_sysmenu/pm/ARM7/Makefile
@@ -21,7 +21,7 @@ SUBDIRS			 =
 #----------------------------------------------------------------------------
 TARGET_FIRM		=	SYSTEMMENU
 TARGET_PLATFORM	=	TWL
-TWL_CODEGEN		=	ARM
+TWL_CODEGEN		?=	ALL
 TWL_ARCHGEN		=	LIMITED
 TWL_PROC		=	ARM7