diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm
index bd57e7f8..daf82991 100644
--- a/build/buildtools/commondefs.firm
+++ b/build/buildtools/commondefs.firm
@@ -18,164 +18,63 @@
 ifndef TWLFIRM_COMMONDEFS_
 TWLFIRM_COMMONDEFS_ = TRUE
 
-NITRO_NO_STD_PCHDR = TRUE # プリコンパイルヘッダ抑止
+EMPTY	 	?=
+SPACE 		?= $(EMPTY) $(EMPTY)
 
 ifndef TWL_KEYSDIR
 DUMMY_KEYS_SUFFIX	=	.dummykey
 endif
-TWL_KEYSDIR			?=	$(FIRM_ROOT)/keys/dummy
+TWL_KEYSDIR		?=	$(FIRM_ROOT)/keys/dummy
 
-
-ifneq ($(filter FIRM GCDFIRM,$(FIRM_TARGET)),)
-TARGET_BIN			?=	$(subst .,$(DUMMY_KEYS_SUFFIX).,$(TARGET_FIRM_BIN))
-endif
-
-EMPTY	 	?=
-SPACE 		?= $(EMPTY) $(EMPTY)
+TARGET_BIN		?=	$(subst .,$(DUMMY_KEYS_SUFFIX).,$(TARGET_FIRM_BIN))
 
 #
-# CodeGen Target
+# change default variables for product
 #
-#	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_PLATFORM		?= TS
-FIRM_MEMSIZE		?= 16M
-FIRM_CODEGEN		?= ARM
-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_ARCHGEN		= $(FIRM_ARCHGEN)
-
-# replace NitroSDK
-ifndef	CODEGEN_PROC
-CODEGEN_PROC		:= $(FIRM_PROC)
-endif
-
-ifeq	($(FIRM_CODEGEN),ALL)
-FIRM_CODEGEN_ALL	?= TRUE
-override FIRM_CODEGEN	 = ARM
-endif
-
-ifeq	($(FIRM_CODEGEN),ARM)
-FIRM_CODEGEN_ARCH		=
-else #	($(FIRM_CODEGEN),THUMB)
-FIRM_CODEGEN_ARCH		= .thumb
-endif
-
-#
-# SDK build type
-#
-#	one of [FIRM_DEBUG/FIRM_RELEASE/FIRM_FINALROM]
-#
-
-ifdef	TARGET_DEBUG
-FIRM_BUILD_TYPE		?= DEBUG
-FIRM_BUILD_DIR		?= Debug
-
-else
-ifdef	TARGET_FINALROM
-FIRM_BUILD_TYPE		?= FINALROM
-FIRM_BUILD_DIR		?= Rom
-
-else	
-ifdef	TARGET_RELEASE
-FIRM_BUILD_TYPE		?= RELEASE
-FIRM_BUILD_DIR		?= Release
-else
-
-ifdef	FIRM_DEBUG
-FIRM_BUILD_TYPE		?= DEBUG
-FIRM_BUILD_DIR		?= Debug
-
-else
-ifdef	FIRM_FINALROM
-FIRM_BUILD_TYPE		?= FINALROM
-FIRM_BUILD_DIR		?= Rom
-
-else #	FIRM_RELEASE (default)
-FIRM_BUILD_TYPE		?= RELEASE
-FIRM_BUILD_DIR		?= Release
-endif
-endif
-endif
-endif
-endif
-
-# replace TwlSDK
-TWL_BUILD_TYPE	?= $(FIRM_BUILD_TYPE)
-TWL_BUILD_DIR	?= $(FIRM_BUILD_DIR)
+override TWL_ARCHGEN	:= LIMITED
+override TWL_MEMSIZE	:= 16M
 
 #----------------------------------------------------------------------------
 #  TWL-FIRM path settings
 #
 
-FIRM_ROOT			:= $(subst $(SPACE),\ ,$(subst \,/,$(TWLIPL_ROOT)))
+FIRM_ROOT		:= $(subst $(SPACE),\ ,$(subst \,/,$(TWLIPL_ROOT)))
 FIRM_BUILDTOOLSDIR	:= $(FIRM_ROOT)/build/buildtools
 FIRM_BUILDSETUPDIR	:= $(FIRM_ROOT)/build/buildsetup
-FIRM_INCDIR			:= $(FIRM_ROOT)/include
+FIRM_INCDIR		:= $(FIRM_ROOT)/include
 FIRM_TOOLSDIR		:= $(FIRM_ROOT)/tools
 FIRM_COMPONENTSDIR	:= $(FIRM_ROOT)/components
-FIRM_ADDINS			?= $(FIRM_ROOT)/add-ins
+FIRM_ADDINS		?= $(FIRM_ROOT)/add-ins
 
 FIRM_TWLSDK_ROOT     ?=$(shell cygpath -w $(TWLSDK_ROOT))
 FIRM_NITROSDK_ROOT   ?=$(shell cygpath -w $(NITROSDK_ROOT))
 
-FIRM_BUILDARCH		?= $(CODEGEN_PROC)-$(FIRM_PLATFORM)$(FIRM_CODEGEN_ARCH)
-FIRM_BUILDARCH_ARM9	:= ARM9-$(FIRM_PLATFORM)$(FIRM_CODEGEN_ARCH)
-FIRM_BUILDARCH_ARM7	:= ARM7-$(FIRM_PLATFORM)$(FIRM_CODEGEN_ARCH)
-
-FIRM_BUILDTYPE		?= $(FIRM_BUILDARCH)/$(FIRM_BUILD_DIR)
-FIRM_BUILDTYPE_ARM9	:= $(FIRM_BUILDARCH_ARM9)/$(FIRM_BUILD_DIR)
-FIRM_BUILDTYPE_ARM7	:= $(FIRM_BUILDARCH_ARM7)/$(FIRM_BUILD_DIR)
-
-FIRM_LIBARCH		:= $(CODEGEN_PROC)-$(FIRM_PLATFORM)
-FIRM_LIBTYPE		:= $(FIRM_LIBARCH)/$(FIRM_BUILD_DIR)
-FIRM_LIBDIR		:= $(FIRM_ROOT)/lib/$(FIRM_LIBTYPE)
-FIRM_LIBSYSCALLDIR	:= $(FIRM_ROOT)/lib/$(FIRM_LIBARCH)/etc
-FIRM_LIBSUFFIX		:= .firm$(FIRM_CODEGEN_ARCH)
-
+FIRM_LIBDIR		= $(FIRM_ROOT)/lib/$(TWL_LIBTYPE)
+FIRM_LIBSUFFIX		= .firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH)
 
 FIRM_SPECDIR		:= $(FIRM_INCDIR)/firm/specfiles
-FIRM_LSFARCH		:= $(FIRM_LIBARCH)
-ifneq ($(FIRM_TARGET),APP)
-FIRM_LSFARCH		:= $(addsuffix -$(FIRM_TARGET),$(FIRM_LSFARCH))
-endif # FIRM_TARGET!=APP
-FIRM_LCFARCH		:= $(FIRM_LSFARCH)
-DEFAULT_FIRM_LCFILE		:= $(FIRM_SPECDIR)/$(FIRM_LCFARCH).lcf
-DEFAULT_FIRM_LCFILE_TEMPLATE	:= $(FIRM_SPECDIR)/$(FIRM_LCFARCH)$(LCF_SUFFIX_).lcf.template
-DEFAULT_FIRM_LCFILE_SPEC	:= $(FIRM_SPECDIR)/$(FIRM_LSFARCH).lsf
-DEFAULT_FIRM_ROM_SPEC	:= $(FIRM_SPECDIR)/ROM-$(FIRM_PLATFORM).rsf
-
-# replace TwlSDK
-TWL_BUILDARCH		?= $(FIRM_BUILDARCH)
-
+FIRM_LSFARCH		= $(TWL_LIBARCH)-FIRM
+FIRM_LCFARCH		= $(FIRM_LSFARCH)
+DEFAULT_FIRM_LCFILE		= $(FIRM_SPECDIR)/$(FIRM_LCFARCH).lcf
+DEFAULT_FIRM_LCFILE_TEMPLATE	= $(FIRM_SPECDIR)/$(FIRM_LCFARCH).lcf.template
+DEFAULT_FIRM_LCFILE_SPEC	= $(FIRM_SPECDIR)/$(FIRM_LSFARCH).lsf
+DEFAULT_FIRM_ROM_SPEC	= $(FIRM_SPECDIR)/ROM-$(TWL_PLATFORM).rsf
 
 ### Compiler & Linker settings
 
 # replace NitroSDK
-ifneq ($(FIRM_TARGET),APP)
 LCFILE_TEMPLATE		?= $(DEFAULT_FIRM_LCFILE_TEMPLATE)
 LCFILE_SPEC		?= $(DEFAULT_FIRM_LCFILE_SPEC)
 ROM_SPEC		?= $(DEFAULT_FIRM_ROM_SPEC)
-endif # FIRM_TARGET!=APP
 
 LDEPENDS_LCF	+= $(FIRM_BUILDTOOLSDIR)/commondefs
 LDEPENDS_RES	+= $(FIRM_BUILDTOOLSDIR)/commondefs
 
+#----------------------------------------------------------------------------
+### TWL-commondefs
+#
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs
+include	$(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot
 
 ### SDK Library settings
 
@@ -188,8 +87,6 @@ FIRM_LIBS_BASE	?= \
 #			   libgcd \
 #			   libacsign \
 
-FIRM_TWL_LIBS_BASE	?= \
-
 else #	($(CODEGEN_PROC),ARM7)
 
 FIRM_LIBS_BASE	?= \
@@ -203,18 +100,9 @@ FIRM_LIBS_BASE	?= \
 #			   libacsign_sp \
 #			   libfirmsd_sp \
 
-FIRM_TWL_LIBS_BASE	?= \
-
 endif
 
 FIRM_LIBS ?= $(addsuffix $(FIRM_LIBSUFFIX).a,$(FIRM_LIBS_BASE))
-FIRM_LIBS += $(addsuffix $(TWL_LIBSUFFIX).a,$(FIRM_TWL_LIBS_BASE))
-
-#----------------------------------------------------------------------------
-### TWL-commondefs
-#
-include	$(TWLSDK_ROOT)/build/buildtools/commondefs
-
 
 #----------------------------------------------------------------------------
 #  MY BUILD TOOLS
@@ -229,16 +117,12 @@ MAKEFIRM_RSA_PUBKEY	?= $(FIRM_TOOLSDIR)/openssl/rsa_public.der
 
 MAKEFIRM_FLAGS	?=
 
-ifneq ($(filter FIRM GCDFIRM,$(FIRM_TARGET)),)
-FIRM_STRIP_AXF	:= TRUE
-endif
-
 #----------------------------------------------------------------------------
 
 ### Global Library resettings
 
 GINCLUDES		:= $(FIRM_INCDIR) $(GINCLUDES)
-GLIBRARY_DIRS	:= $(FIRM_LIBDIR) $(GLIBRARY_DIRS)
+GLIBRARY_DIRS		:= $(FIRM_LIBDIR) $(GLIBRARY_DIRS)
 GLIBRARIES		:= $(FIRM_LIBS)   $(GLIBRARIES)
 
 
@@ -255,18 +139,11 @@ endif
 FIRM_INSTALL_ROOT	:= $(subst $(SPACE),\ ,$(subst \,/,$(TWLFIRM_INSTALL_ROOT_)))
 FIRM_INSTALL_INCDIR	:= $(FIRM_INSTALL_ROOT)/include
 FIRM_INSTALL_TOOLSDIR	:= $(FIRM_INSTALL_ROOT)/tools
-FIRM_INSTALL_LIBDIR	:= $(FIRM_INSTALL_ROOT)/lib/$(FIRM_LIBTYPE)
+FIRM_INSTALL_LIBDIR	= $(FIRM_INSTALL_ROOT)/lib/$(TWL_LIBTYPE)
 FIRM_INSTALL_PROMDIR	:= $(FIRM_INSTALL_TOOLSDIR)/prom
 FIRM_INSTALL_COMPONENTSDIR	:= $(FIRM_INSTALL_ROOT)/components
 FIRM_INSTALL_ADDINS	:= $(FIRM_INSTALL_ROOT)/add-ins
 
-
-#----------------------------------------------------------------------------
-#  Compiler flags
-#
-MACRO_FLAGS += -DFIRM_TARGET_$(FIRM_TARGET)
-
-
 #----------------------------------------------------------------------------
 endif	# TWLFIRM_COMMONDEFS_
 #----- End of commondefs -----
diff --git a/build/buildtools/modulerules.firm b/build/buildtools/modulerules.firm
index 4ea316f6..d09d9980 100644
--- a/build/buildtools/modulerules.firm
+++ b/build/buildtools/modulerules.firm
@@ -17,14 +17,6 @@
 #----------------------------------------------------------------------------
 ifndef TWLFIRM_MODULERULES_
 
-
-ifneq ($(MAKEFIRM_ARM9),)
-MAKEROM_ARM9		= $(MAKEFIRM_ARM9)
-endif
-ifneq ($(MAKEFIRM_ARM7),)
-MAKEROM_ARM7		= $(MAKEFIRM_ARM7)
-endif
-
 #----------------------------------------------------------------------------
 ### TWL-modulerules
 #
@@ -32,19 +24,23 @@ include	$(TWLSDK_ROOT)/build/buildtools/modulerules
 
 #----------------------------------------------------------------------------
 
+#
+# MAKEROM for IS-TWL-DEBUGGER
+#
+ifeq ($(filter $(MAKEROM_FLAGS),-F),)
+MAKEROM_FLAGS	+= -F
+endif
+
 #
 # MAKENORFIRM / MAKENANDFIRM / MAKEGCDFIRM
 #
 
-MAKEFIRM_ARM9		?= $(MAKEROM_ARM9)
-MAKEFIRM_ARM7		?= $(MAKEROM_ARM7)
-
 MAKEFIRM_DEFS	+= -DFIRM_ROOT='$(FIRM_ROOT)' \
 				-DMAKEFIRM_ARM9='$(basename $(MAKEFIRM_ARM9))' \
 				-DMAKEFIRM_ARM7='$(basename $(MAKEFIRM_ARM7))' \
 				-DMAKEFIRM_RSA_PRVKEY='$(MAKEFIRM_RSA_PRVKEY)' \
 
-SDEPENDS_BIN		+= $(MAKEFIRM_RSA_PRVKEY)
+FIRM_SDEPENDS_BIN	= $(MAKEFIRM_RSA_PRVKEY)
 
 
 .PHONY: 	firmtop firmlib
@@ -56,36 +52,21 @@ firmlib:
 	@$(MAKE) -C $(TWLIPL_ROOT)/build/libraries
 
 # .nor
-$(BINDIR)/%.nor: $(SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENORFIRM)
+$(BINDIR)/%.nor: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENORFIRM)
 	$(MAKENORFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .nand
-$(BINDIR)/%.nand: $(SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENANDFIRM)
+$(BINDIR)/%.nand: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENANDFIRM)
 	$(MAKENANDFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .gcd
-$(BINDIR)/%.gcd: $(SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKEGCDFIRM)
+$(BINDIR)/%.gcd: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKEGCDFIRM)
 	$(MAKEGCDFIRM) $(MAKEFIRM_FLAGS) $(MAKEFIRM_DEFS) $(FIRM_SPEC) $@
 
 # .rbin
 $(BINDIR)/$(TARGET_BIN_BASENAME).rbin: $(OBJS)
 	objcopy -I elf32-little -O binary $< $@
 
-# .axf
-#$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX)
-#ifeq ($(NITRO_CCTYPE),RVCT)
-#	$(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS)
-#else
-#	$(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@
-#ifeq	($(TWL_PLATFORM),TS)
-#	cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).tef
-#else  # ($(TWL_PLATFORM),BB)
-#ifdef FIRM_STRIP_AXF
-#	$(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin
-#endif
-#endif
-#endif
-
 #----------------------------------------------------------------------------
 TWLFIRM_MODULERULES_ = TRUE
 endif	# TWLFIRM_MODULERULES_
diff --git a/build/libraries/aes/ARM7/Makefile b/build/libraries/aes/ARM7/Makefile
index a19bb1de..753542ea 100644
--- a/build/libraries/aes/ARM7/Makefile
+++ b/build/libraries/aes/ARM7/Makefile
@@ -23,10 +23,10 @@ SUBMAKES	=
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
+TWL_CODEGEN_ALL 	?= TRUE
 
 # Codegen for sub processer
-FIRM_PROC		= ARM7
+TWL_PROC		= ARM7
 
 SRCDIR			= .
 
@@ -38,13 +38,6 @@ TARGET_LIB		= libaes_sp$(FIRM_LIBSUFFIX).a
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	= RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		= $(TARGETS)
diff --git a/build/libraries/fatfs/ARM7/Makefile b/build/libraries/fatfs/ARM7/Makefile
index 16ea02f2..642bcefd 100644
--- a/build/libraries/fatfs/ARM7/Makefile
+++ b/build/libraries/fatfs/ARM7/Makefile
@@ -23,10 +23,10 @@ SUBMAKES	=
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
+TWL_CODEGEN_ALL 	?= TRUE
 
 # Codegen for sub processer
-FIRM_PROC		= ARM7
+TWL_PROC		= ARM7
 
 INCDIR			= \
 			  $(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include \
@@ -43,13 +43,6 @@ TARGET_LIB		= libfatfs_sp$(FIRM_LIBSUFFIX).a
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	= RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		= $(TARGETS)
diff --git a/build/libraries/gcd/ARM7/Makefile b/build/libraries/gcd/ARM7/Makefile
index 29f06b7a..16367b42 100644
--- a/build/libraries/gcd/ARM7/Makefile
+++ b/build/libraries/gcd/ARM7/Makefile
@@ -21,9 +21,9 @@ SUBDIRS				=
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?=	True
+TWL_CODEGEN_ALL 	?=	True
 
-FIRM_PROC			=	ARM7
+TWL_PROC			=	ARM7
 
 SRCDIR				=	. ../common
 SRCS				=	\
@@ -39,13 +39,6 @@ INCDIR				=	../include
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	=	RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		=	$(TARGETS)
diff --git a/build/libraries/gcd/ARM9/Makefile b/build/libraries/gcd/ARM9/Makefile
index 52cee619..c77de0e8 100644
--- a/build/libraries/gcd/ARM9/Makefile
+++ b/build/libraries/gcd/ARM9/Makefile
@@ -21,7 +21,7 @@ SUBDIRS				=
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?=	True
+TWL_CODEGEN_ALL 	?=	True
 
 
 
@@ -39,13 +39,6 @@ INCDIR				=	../include
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	=	RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		=	$(TARGETS)
diff --git a/build/libraries/init/ARM7/Makefile b/build/libraries/init/ARM7/Makefile
index ae15c2bb..839a13cc 100644
--- a/build/libraries/init/ARM7/Makefile
+++ b/build/libraries/init/ARM7/Makefile
@@ -16,17 +16,14 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
+override TARGET_CODEGEN		:= ARM
+
 SUBDIRS			=
-#SUBMAKES		= Makefile.CALLTRACE 	\
-#			  Makefile.FUNCTIONCOST
 
 #----------------------------------------------------------------------------
 
-# build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
-
 # Codegen for sub processer
-FIRM_PROC		= ARM7
+TWL_PROC		= ARM7
 
 SRCS			= crt0_firm.c \
 
@@ -35,13 +32,6 @@ TARGET_OBJ		= crt0_firm.o
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	= RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		= $(TARGETS)
diff --git a/build/libraries/init/ARM9/Makefile b/build/libraries/init/ARM9/Makefile
index 7481707b..e76af963 100644
--- a/build/libraries/init/ARM9/Makefile
+++ b/build/libraries/init/ARM9/Makefile
@@ -16,28 +16,18 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
+override TARGET_CODEGEN		:= ARM
+
 SUBDIRS			=
-#SUBMAKES		= Makefile.CALLTRACE 	\
-#			  Makefile.FUNCTIONCOST
 
 #----------------------------------------------------------------------------
 
-# build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
-
 SRCS			= crt0_firm.c \
 
 TARGET_OBJ		= crt0_firm.o
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	= RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		= $(TARGETS)
diff --git a/build/libraries/mi/ARM9/Makefile b/build/libraries/mi/ARM9/Makefile
index e8461f13..cb83e1e6 100644
--- a/build/libraries/mi/ARM9/Makefile
+++ b/build/libraries/mi/ARM9/Makefile
@@ -23,7 +23,7 @@ SUBMAKES			=
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL	?=	TRUE
+TWL_CODEGEN_ALL	?=	TRUE
 
 SRCDIR				=	. ../common
 
@@ -39,18 +39,6 @@ include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 INSTALL_TARGETS		=	$(TARGETS)
 INSTALL_DIR			=	$(FIRM_INSTALL_LIBDIR)
 
-ifdef NITRO_CALLTRACE
-CCFLAGS				+=	-DOS_PROFILE_AVAILABLE -DOS_PROFILE_CALL_TRACE
-endif
-
-ifdef NITRO_FUNCTIONCOST
-CCFLAGS				+=	-DOS_PROFILE_AVAILABLE -DOS_PROFILE_FUNCTION_COST
-endif
-
-ifdef NITRO_TCM_APPLY
-CCFLAGS				+=	-DSDK_TCM_APPLY
-endif
-
 #----------------------------------------------------------------------------
 
 do-build:		$(TARGETS)
diff --git a/build/libraries/os/ARM7/Makefile b/build/libraries/os/ARM7/Makefile
index 8ebb4500..cd454cde 100644
--- a/build/libraries/os/ARM7/Makefile
+++ b/build/libraries/os/ARM7/Makefile
@@ -17,16 +17,14 @@
 #----------------------------------------------------------------------------
 
 SUBDIRS			=
-#SUBMAKES		= Makefile.CALLTRACE 	\
-#			  Makefile.FUNCTIONCOST
 
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
+TWL_CODEGEN_ALL 	?= TRUE
 
 # Codegen for sub processer
-FIRM_PROC		= ARM7
+TWL_PROC		= ARM7
 
 SRCDIR			= ../common .
 
@@ -39,13 +37,6 @@ TARGET_LIB		= libos_sp$(FIRM_LIBSUFFIX).a
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	= RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		= $(TARGETS)
diff --git a/build/libraries/os/ARM9/Makefile b/build/libraries/os/ARM9/Makefile
index 2e551901..63022113 100644
--- a/build/libraries/os/ARM9/Makefile
+++ b/build/libraries/os/ARM9/Makefile
@@ -23,14 +23,13 @@ SUBMAKES	=
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
+TWL_CODEGEN_ALL 	?= TRUE
 
 SRCDIR		= ../common .
 
 SRCS			= \
 				os_init_firm.c \
 				os_boot.c \
-				os_cache_tag.c \
 
 TARGET_LIB		= libos$(FIRM_LIBSUFFIX).a
 
@@ -39,18 +38,6 @@ include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 INSTALL_TARGETS		= $(TARGETS)
 INSTALL_DIR		= $(FIRM_INSTALL_LIBDIR)
 
-ifdef NITRO_CALLTRACE
-CCFLAGS			+= -DOS_PROFILE_AVAILABLE -DOS_PROFILE_CALL_TRACE
-endif
-
-ifdef NITRO_FUNCTIONCOST
-CCFLAGS			+= -DOS_PROFILE_AVAILABLE -DOS_PROFILE_FUNCTION_COST
-endif
-
-ifdef NITRO_TCM_APPLY
-CCFLAGS			+= -DSDK_TCM_APPLY
-endif
-
 #----------------------------------------------------------------------------
 
 do-build:		$(TARGETS)
diff --git a/build/libraries/pm/ARM7/Makefile b/build/libraries/pm/ARM7/Makefile
index 124e3af3..14b4bc64 100644
--- a/build/libraries/pm/ARM7/Makefile
+++ b/build/libraries/pm/ARM7/Makefile
@@ -23,10 +23,10 @@ SUBMAKES	=
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
+TWL_CODEGEN_ALL 	?= TRUE
 
 # Codegen for sub processer
-FIRM_PROC		= ARM7
+TWL_PROC		= ARM7
 
 INCDIR			= $(TWLSDK_ROOT)/build/libraries/spi/ARM7/pm/include \
 
@@ -40,13 +40,6 @@ TARGET_LIB		= libpm_sp$(FIRM_LIBSUFFIX).a
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	= RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		= $(TARGETS)
diff --git a/build/libraries/pxi/ARM7/Makefile b/build/libraries/pxi/ARM7/Makefile
index 72fd9f68..cd107800 100644
--- a/build/libraries/pxi/ARM7/Makefile
+++ b/build/libraries/pxi/ARM7/Makefile
@@ -17,16 +17,14 @@
 #----------------------------------------------------------------------------
 
 SUBDIRS			=
-#SUBMAKES		= Makefile.CALLTRACE 	\
-#			  Makefile.FUNCTIONCOST
 
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
+TWL_CODEGEN_ALL 	?= TRUE
 
 # Codegen for sub processer
-FIRM_PROC		= ARM7
+TWL_PROC		= ARM7
 
 SRCDIR			= ../common .
 
@@ -38,13 +36,6 @@ TARGET_LIB		= libpxi_sp$(FIRM_LIBSUFFIX).a
 
 #----------------------------------------------------------------------------
 
-# DEBUG版ビルドの場合、RELEASE版でビルドして
-# DEBUG版のライブラリを装います。
-
-ifdef	NITRO_DEBUG
-NITRO_BUILD_TYPE	= RELEASE
-endif
-
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
 INSTALL_TARGETS		= $(TARGETS)
diff --git a/build/libraries/pxi/ARM9/Makefile b/build/libraries/pxi/ARM9/Makefile
index 52fe444c..fb0a7b0e 100644
--- a/build/libraries/pxi/ARM9/Makefile
+++ b/build/libraries/pxi/ARM9/Makefile
@@ -23,7 +23,7 @@ SUBMAKES	=
 #----------------------------------------------------------------------------
 
 # build ARM & THUMB libraries
-FIRM_CODEGEN_ALL 	?= TRUE
+TWL_CODEGEN_ALL 	?= TRUE
 
 SRCDIR		= ../common .
 
@@ -37,18 +37,6 @@ include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 INSTALL_TARGETS		= $(TARGETS)
 INSTALL_DIR		= $(FIRM_INSTALL_LIBDIR)
 
-ifdef NITRO_CALLTRACE
-CCFLAGS			+= -DOS_PROFILE_AVAILABLE -DOS_PROFILE_CALL_TRACE
-endif
-
-ifdef NITRO_FUNCTIONCOST
-CCFLAGS			+= -DOS_PROFILE_AVAILABLE -DOS_PROFILE_FUNCTION_COST
-endif
-
-ifdef NITRO_TCM_APPLY
-CCFLAGS			+= -DSDK_TCM_APPLY
-endif
-
 #----------------------------------------------------------------------------
 
 do-build:		$(TARGETS)
diff --git a/build/nandfirm/Makefile b/build/nandfirm/Makefile
index c74b7087..d90ccf19 100644
--- a/build/nandfirm/Makefile
+++ b/build/nandfirm/Makefile
@@ -26,7 +26,6 @@ SUBDIRS		= \
 			sdmc-launcher \
 			menu-launcher \
 
-
 #----------------------------------------------------------------------------
 
 include	$(TWLIPL_ROOT)/build/buildtools/modulerules
diff --git a/build/nandfirm/menu-launcher/ARM7/Makefile b/build/nandfirm/menu-launcher/ARM7/Makefile
index 89d5dbff..39f65d54 100644
--- a/build/nandfirm/menu-launcher/ARM7/Makefile
+++ b/build/nandfirm/menu-launcher/ARM7/Makefile
@@ -16,8 +16,7 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
-FIRM_PROC      = ARM7
-FIRM_TARGET    = FIRM
+TWL_PROC       = ARM7
 
 SUBDIRS		=
 
@@ -31,14 +30,14 @@ SRCS		=	main.c
 
 CRT0_O		=	crt0_firm.o
 
-#LCFILE_TEMPLATE =	$(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template
+#LCFILE_TEMPLATE =	$(FIRM_SPECDIR)/$(TWL_PROC)-$(TWL_PLATFORM)-PARTNER.lcf.template
 
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
 
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
-LLIBRARIES	=	libaes_sp$(TWL_LIBSUFFIX).a
+LLIBRARIES	+=	libaes_sp$(TWL_LIBSUFFIX).a
 MAKELCF_FLAGS	+=	-DADDRESS_LTDWRAM='0x037c0000'
 
 #----------------------------------------------------------------------------
diff --git a/build/nandfirm/menu-launcher/ARM9/Makefile b/build/nandfirm/menu-launcher/ARM9/Makefile
index be87a7c6..6f7bd38f 100644
--- a/build/nandfirm/menu-launcher/ARM9/Makefile
+++ b/build/nandfirm/menu-launcher/ARM9/Makefile
@@ -16,8 +16,6 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
-FIRM_TARGET    = FIRM
-
 SUBDIRS		=
 
 LINCLUDES	=   ../include
@@ -30,12 +28,11 @@ SRCS		=	main.c
 
 CRT0_O		=	crt0_firm.o
 
-MAKEROM_ARM9		=	ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher9.tef
-MAKEROM_ARM7		=	../ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher7.tef
+MAKEROM_ARM7		=	../ARM7/bin/$(TWL_BUILDTYPE_ARM7)/menu_launcher7.tef
 MAKEROM_ARM7_BASE       =       $(basename $(MAKEROM_ARM7))
 MAKEROM_FLAGS		+=	-F
 
-#LCFILE_TEMPLATE =	$(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template
+#LCFILE_TEMPLATE =	$(FIRM_SPECDIR)/$(TWL_PROC)-$(TWL_PLATFORM)-PARTNER.lcf.template
 
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
diff --git a/build/nandfirm/menu-launcher/Makefile b/build/nandfirm/menu-launcher/Makefile
index d239ff62..9eb31024 100644
--- a/build/nandfirm/menu-launcher/Makefile
+++ b/build/nandfirm/menu-launcher/Makefile
@@ -17,8 +17,6 @@
 #----------------------------------------------------------------------------
 
 
-FIRM_TARGET    = FIRM
-
 # if you have valid keys, set environment value like below
 #export TWL_KEYSDIR='$(FIRM_ROOT)/../twl_firmware/bootrom/build/keys'
 
@@ -30,10 +28,10 @@ SUBDIRS =	\
             ARM7 \
             ARM9 \
 
-TARGET_FIRM_BIN		=	menu_launcher-$(FIRM_BUILD_TYPE).nand
+TARGET_FIRM_BIN		=	menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand
 BINDIR			=	.
-MAKEFIRM_ARM9		=	ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher9.tef
-MAKEFIRM_ARM7		=	ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher7.tef
+MAKEFIRM_ARM9		=	ARM9/bin/$(TWL_BUILDTYPE_ARM9)/menu_launcher9.tef
+MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/menu_launcher7.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nand.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
diff --git a/build/nandfirm/menu-launcher/wram_regs/Makefile b/build/nandfirm/menu-launcher/wram_regs/Makefile
index cb6c3051..dcfb4c4f 100644
--- a/build/nandfirm/menu-launcher/wram_regs/Makefile
+++ b/build/nandfirm/menu-launcher/wram_regs/Makefile
@@ -1,6 +1,6 @@
 #! make -f
 #----------------------------------------------------------------------------
-# Project:  TwlFirm - tools - norfirm-print
+# Project:  TwlFirm - nandfirm - menu-launcher
 # File:     Makefile
 #
 # Copyright 2007 Nintendo.  All rights reserved.
@@ -16,16 +16,25 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
+override TARGET_PLATFORM	:= TWL
+override TARGET_CODEGEN		:= ARM
+override TWL_ARCHGEN		:= LIMITED
+
+override TARGET_FINALROM	:= TRUE
+override TARGET_RELEASE		:=
+override TARGET_DEBUG		:=
+
 SUBDIRS		=
 
 LINCLUDES	=   ../include
 
+
 #----------------------------------------------------------------------------
 
 TARGET_BIN	=	wram_regs.rbin
 
 SRCS		=	\
-                	wram_regs.c \
+                wram_regs.c \
 
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
diff --git a/build/nandfirm/nandfirm-print/Makefile b/build/nandfirm/nandfirm-print/Makefile
index a859c24e..3f698393 100644
--- a/build/nandfirm/nandfirm-print/Makefile
+++ b/build/nandfirm/nandfirm-print/Makefile
@@ -17,17 +17,14 @@
 #----------------------------------------------------------------------------
 
 
-FIRM_TARGET    = FIRM
-
-
 #----------------------------------------------------------------------------
 
 SUBDIRS =	../../norfirm/norfirm-print
 
-TARGET_FIRM_BIN		=	nandfirm_print-$(FIRM_BUILD_TYPE).nand
+TARGET_FIRM_BIN		=	nandfirm_print-$(TWL_BUILD_TYPE).nand
 BINDIR			=	.
-MAKEFIRM_ARM9		=	../../norfirm/norfirm-print/ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.tef
-MAKEFIRM_ARM7		=	../../norfirm/norfirm-print/ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.tef
+MAKEFIRM_ARM9		=	../../norfirm/norfirm-print/ARM9/bin/$(TWL_BUILDTYPE_ARM9)/twl_norfirm9_print.tef
+MAKEFIRM_ARM7		=	../../norfirm/norfirm-print/ARM7/bin/$(TWL_BUILDTYPE_ARM7)/twl_norfirm7_print.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nand.der
 LDEPENDS_BIN		+=	../../norfirm/norfirm-print/wram_regs/wram_regs.rbin
 
diff --git a/build/nandfirm/sdmc-launcher/ARM7/Makefile b/build/nandfirm/sdmc-launcher/ARM7/Makefile
index 8fb053f6..a0d97ed6 100644
--- a/build/nandfirm/sdmc-launcher/ARM7/Makefile
+++ b/build/nandfirm/sdmc-launcher/ARM7/Makefile
@@ -16,8 +16,7 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
-FIRM_PROC      = ARM7
-FIRM_TARGET    = FIRM
+TWL_PROC       = ARM7
 
 SUBDIRS		=
 
@@ -31,14 +30,14 @@ SRCS		=	main.c
 
 CRT0_O		=	crt0_firm.o
 
-#LCFILE_TEMPLATE =	$(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template
+#LCFILE_TEMPLATE =	$(FIRM_SPECDIR)/$(TWL_PROC)-$(TWL_PLATFORM)-PARTNER.lcf.template
 
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
 
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
-LLIBRARIES	=	libaes_sp$(TWL_LIBSUFFIX).a
+LLIBRARIES	+=	libaes_sp$(TWL_LIBSUFFIX).a
 MAKELCF_FLAGS	+=	-DADDRESS_LTDWRAM='0x037c0000'
 
 #----------------------------------------------------------------------------
@@ -48,5 +47,9 @@ do-build:		$(TARGETS)
 
 include	$(TWLIPL_ROOT)/build/buildtools/modulerules
 
+test:
+	@echo LLIBRARY_DIRS=$(LLIBRARY_DIRS)
+	@echo TWL_BUILDTYPE=$(TWL_BUILDTYPE)
+
 
 #===== End of Makefile =====
diff --git a/build/nandfirm/sdmc-launcher/ARM9/Makefile b/build/nandfirm/sdmc-launcher/ARM9/Makefile
index bf5cad3f..8a291646 100644
--- a/build/nandfirm/sdmc-launcher/ARM9/Makefile
+++ b/build/nandfirm/sdmc-launcher/ARM9/Makefile
@@ -16,8 +16,6 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
-FIRM_TARGET    = FIRM
-
 SUBDIRS		=
 
 LINCLUDES	=   ../include
@@ -30,12 +28,11 @@ SRCS		=	main.c
 
 CRT0_O		=	crt0_firm.o
 
-MAKEROM_ARM9		=	ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher9.tef
-MAKEROM_ARM7		=	../ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher7.tef
+MAKEROM_ARM7		=	../ARM7/bin/$(TWL_BUILDTYPE_ARM7)/sdmc_launcher7.tef
 MAKEROM_ARM7_BASE       =       $(basename $(MAKEROM_ARM7))
 MAKEROM_FLAGS		+=	-F
 
-#LCFILE_TEMPLATE =	$(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template
+#LCFILE_TEMPLATE =	$(FIRM_SPECDIR)/$(TWL_PROC)-$(TWL_PLATFORM)-PARTNER.lcf.template
 
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
diff --git a/build/nandfirm/sdmc-launcher/Makefile b/build/nandfirm/sdmc-launcher/Makefile
index 12ff21f9..e3b89b0f 100644
--- a/build/nandfirm/sdmc-launcher/Makefile
+++ b/build/nandfirm/sdmc-launcher/Makefile
@@ -17,8 +17,6 @@
 #----------------------------------------------------------------------------
 
 
-FIRM_TARGET    = FIRM
-
 # if you have valid keys, set environment value like below
 #export TWL_KEYSDIR='$(FIRM_ROOT)/../twl_firmware/bootrom/build/keys'
 
@@ -30,10 +28,10 @@ SUBDIRS =	\
             ARM7 \
             ARM9 \
 
-TARGET_FIRM_BIN		=	sdmc_launcher-$(FIRM_BUILD_TYPE).nand
+TARGET_FIRM_BIN		=	sdmc_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand
 BINDIR			=	.
-MAKEFIRM_ARM9		=	ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher9.tef
-MAKEFIRM_ARM7		=	ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher7.tef
+MAKEFIRM_ARM9		=	ARM9/bin/$(TWL_BUILDTYPE_ARM9)/sdmc_launcher9.tef
+MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/sdmc_launcher7.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nand.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
diff --git a/build/nandfirm/sdmc-launcher/wram_regs/Makefile b/build/nandfirm/sdmc-launcher/wram_regs/Makefile
index cb6c3051..59ae8957 100644
--- a/build/nandfirm/sdmc-launcher/wram_regs/Makefile
+++ b/build/nandfirm/sdmc-launcher/wram_regs/Makefile
@@ -1,6 +1,6 @@
 #! make -f
 #----------------------------------------------------------------------------
-# Project:  TwlFirm - tools - norfirm-print
+# Project:  TwlFirm - nandfirm - sdmc-launcher
 # File:     Makefile
 #
 # Copyright 2007 Nintendo.  All rights reserved.
@@ -16,16 +16,25 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
+override TARGET_PLATFORM	:= TWL
+override TARGET_CODEGEN		:= ARM
+override TWL_ARCHGEN		:= LIMITED
+
+override TARGET_FINALROM	:= TRUE
+override TARGET_RELEASE		:=
+override TARGET_DEBUG		:=
+
 SUBDIRS		=
 
 LINCLUDES	=   ../include
 
+
 #----------------------------------------------------------------------------
 
 TARGET_BIN	=	wram_regs.rbin
 
 SRCS		=	\
-                	wram_regs.c \
+                wram_regs.c \
 
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile
index bfab6142..254823c5 100644
--- a/build/norfirm/norfirm-empty/Makefile
+++ b/build/norfirm/norfirm-empty/Makefile
@@ -16,14 +16,19 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
+override TARGET_PLATFORM	:= TWL
+override TARGET_CODEGEN		:= ARM
+override TWL_ARCHGEN		:= LIMITED
 
-FIRM_TARGET    = FIRM
+override TARGET_FINALROM	:= TRUE
+override TARGET_RELEASE		:=
+override TARGET_DEBUG		:=
 
 #----------------------------------------------------------------------------
 
 SUBDIRS =	\
 
-TARGET_FIRM_BIN		=	norfirm_empty-$(FIRM_BUILD_TYPE).nor
+TARGET_FIRM_BIN		=	norfirm_empty.nor
 BINDIR			=	.
 MAKEFIRM_ARM9	 	=
 MAKEFIRM_ARM7	 	=
diff --git a/build/norfirm/norfirm-print/ARM7/Makefile b/build/norfirm/norfirm-print/ARM7/Makefile
index d00372ee..fd7a991a 100644
--- a/build/norfirm/norfirm-print/ARM7/Makefile
+++ b/build/norfirm/norfirm-print/ARM7/Makefile
@@ -16,8 +16,7 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
-FIRM_PROC      = ARM7
-FIRM_TARGET    = FIRM
+TWL_PROC      = ARM7
 
 SUBDIRS		=
 
@@ -38,7 +37,6 @@ SRCS		=	\
 
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
-
 #----------------------------------------------------------------------------
 
 do-build:		$(TARGETS)
diff --git a/build/norfirm/norfirm-print/ARM9/Makefile b/build/norfirm/norfirm-print/ARM9/Makefile
index ab5f4f76..9139e3a6 100644
--- a/build/norfirm/norfirm-print/ARM9/Makefile
+++ b/build/norfirm/norfirm-print/ARM9/Makefile
@@ -16,8 +16,6 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
-FIRM_TARGET    = FIRM
-
 SUBDIRS		=
 
 LINCLUDES	=   ../include
@@ -30,10 +28,8 @@ SRCS		=	main.c
 
 CRT0_O		=	crt0_firm.o
 
-MAKEROM_ARM9		=	ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.tef
-MAKEROM_ARM7		=	../ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.tef
+MAKEROM_ARM7		=	../ARM7/bin/$(TWL_BUILDTYPE_ARM7)/twl_norfirm7_print.tef
 MAKEROM_ARM7_BASE       =       $(basename $(MAKEROM_ARM7))
-MAKEROM_FLAGS		+=	-F
 
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
@@ -41,7 +37,6 @@ MAKEROM_FLAGS		+=	-F
 
 include	$(TWLIPL_ROOT)/build/buildtools/commondefs
 
-
 #----------------------------------------------------------------------------
 
 do-build:		$(TARGETS)
diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile
index 3fa5695f..d28f8122 100644
--- a/build/norfirm/norfirm-print/Makefile
+++ b/build/norfirm/norfirm-print/Makefile
@@ -17,8 +17,6 @@
 #----------------------------------------------------------------------------
 
 
-FIRM_TARGET    = FIRM
-
 # if you have no valid key, comment out next line
 #TWL_KEYSDIR = $(FIRM_ROOT)/../twl_firmware/bootrom/build/keys
 
@@ -30,10 +28,10 @@ SUBDIRS =	\
             ARM7 \
             ARM9 \
 
-TARGET_FIRM_BIN		=	norfirm_print-$(FIRM_BUILD_TYPE).nor
+TARGET_FIRM_BIN		=	norfirm_print-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nor
 BINDIR			=	.
-MAKEFIRM_ARM9		=	ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.tef
-MAKEFIRM_ARM7		=	ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.tef
+MAKEFIRM_ARM9		=	ARM9/bin/$(TWL_BUILDTYPE_ARM9)/twl_norfirm9_print.tef
+MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/twl_norfirm7_print.tef
 MAKEFIRM_RSA_PRVKEY	=	$(TWL_KEYSDIR)/rsa/private_nor.der
 LDEPENDS_BIN		+=	wram_regs/wram_regs.rbin
 
diff --git a/build/norfirm/norfirm-print/wram_regs/Makefile b/build/norfirm/norfirm-print/wram_regs/Makefile
index f0ecbeda..bc94ae79 100644
--- a/build/norfirm/norfirm-print/wram_regs/Makefile
+++ b/build/norfirm/norfirm-print/wram_regs/Makefile
@@ -16,10 +16,19 @@
 # $Author:$
 #----------------------------------------------------------------------------
 
+override TARGET_PLATFORM	:= TWL
+override TARGET_CODEGEN		:= ARM
+override TWL_ARCHGEN		:= LIMITED
+
+override TARGET_FINALROM	:= TRUE
+override TARGET_RELEASE		:=
+override TARGET_DEBUG		:=
+
 SUBDIRS		=
 
 LINCLUDES	=   ../include
 
+
 #----------------------------------------------------------------------------
 
 TARGET_BIN	=	wram_regs.rbin