diff --git a/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile
index 2e9070f6..db0a443c 100644
--- a/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile
+++ b/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile
@@ -31,15 +31,12 @@ TWL_NO_STD_PCHDR			=	True
 ifndef	TWLSDK_NOCRYPTO
 #----------------------------------------------------------------------------
 
-SRCS		=	main.c \
-				kami_pxi.c \
-				formatter.c \
-				nvram_misc.c
+SRCS		=	main.c
 
 TARGET_NAME		=	armadillo
 
 TARGET_NEF		=	$(TARGET_NAME).tef
-LCFILE_SPEC		=	../../NandInitializerRed/ARM7.TWL/$(TARGET_NAME).lsf
+LCFILE_SPEC		=	$(TARGET_NAME).lsf
 LCFILE_TEMPLATE	=	../../NandInitializerRed/ARM7.TWL/$(TARGET_NAME).lcf.template
 LDRES_TEMPLATE	=	../../NandInitializerRed/ARM7.TWL/$(TARGET_NAME).response.template
 
diff --git a/build/systemMenu_RED/NandInitializer/ARM7.TWL/armadillo.lsf b/build/systemMenu_RED/NandInitializer/ARM7.TWL/armadillo.lsf
new file mode 100644
index 00000000..0cda7e58
--- /dev/null
+++ b/build/systemMenu_RED/NandInitializer/ARM7.TWL/armadillo.lsf
@@ -0,0 +1,84 @@
+#----------------------------------------------------------------------------
+# Project:  TwlSDK - components - armadillo.TWL
+# File:     armadillo.lsf
+#
+# Copyright 2008 Nintendo.  All rights reserved.
+#
+# These coded insructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+#
+#  Nitro LCF SPEC FILE
+#
+#--------
+Static $(TARGET_NAME)
+{
+	Address		0x02380000
+	StackSize	1024 1024
+
+	Library		$(CRT0_O)
+}
+
+#--------
+Ltdautoload SCRWRAM
+{
+	Address		0x03740000
+
+	Library		libsubpsyscall.a
+	Library		libsyscall_sp.twl.a
+	Library		$(CW_LIBS)
+	Library		$(ISDBG_LIBS_TWL)
+	Library		$(ISDBG_LIBS_NITRO)
+
+	Object		* (.etable)
+	Object		$(OBJDIR)/main.o
+
+	Library		libsea_sp$(LIBSUFFIX).a
+	Library		libcrypto_sp$(LIBSUFFIX).a
+
+	Library		libos_sp$(LIBSUFFIX).a
+	Library		libmi_sp$(LIBSUFFIX).a
+	Library		libstd_sp$(LIBSUFFIX).a
+	Library		libmath_sp$(LIBSUFFIX).a
+	Library		libpxi_sp$(LIBSUFFIX).a
+	Library		libexi_sp$(LIBSUFFIX).a
+	Library		libi2c_sp$(LIBSUFFIX).a
+	Library		libsdio_sp$(LIBSUFFIX).a
+	Library		libpad_sp$(LIBSUFFIX).a
+	Library		libscfg_sp$(LIBSUFFIX).a
+	Library		libmcu_sp$(LIBSUFFIX).a
+	Library		libcdc_sp$(LIBSUFFIX).a
+	Library		libsnd_sp$(LIBSUFFIX).a
+	Library		libsndex_sp$(LIBSUFFIX).a
+	Library		libspi_sp$(LIBSUFFIX).a
+	Library		libpm_sp$(LIBSUFFIX).a
+	Library		libtp_sp$(LIBSUFFIX).a
+	Library		libtpex_sp$(LIBSUFFIX).a
+	Library		libmic_sp$(LIBSUFFIX).a
+	Library		libmicex_sp$(LIBSUFFIX).a
+	Library		libnvram_sp$(LIBSUFFIX).a
+	Library		librtc_sp$(LIBSUFFIX).a
+	Library		libfatfs_sp$(LIBSUFFIX).a
+#	Library		libwm_sp$(LIBSUFFIX).a
+#	Library		libnwm_sp$(LIBSUFFIX).a
+	Library		libwvr_sp$(LIBSUFFIX).a
+	Library		libwl_sp$(LIBSUFFIX).a
+	Library		libwpa_sp$(LIBSUFFIX).a
+	Library		libathdrv_sp$(LIBSUFFIX).a
+	Library		libfs_sp$(LIBSUFFIX).a
+	Library		libcard_sp$(LIBSUFFIX).a
+#	Library		libcamera_sp$(LIBSUFFIX).a
+
+	Object		* (.wram)
+	Object		* (.ltdwram)
+	Object		* (.rsvwram)
+	Object		* (.main)
+	Object		* (.ltdmain)
+}
diff --git a/build/systemMenu_RED/NandInitializerRed/ARM7.TWL/src/kami_pxi.c b/build/systemMenu_RED/NandInitializerRed/ARM7.TWL/src/kami_pxi.c
index db3403d8..d0a1daa1 100644
--- a/build/systemMenu_RED/NandInitializerRed/ARM7.TWL/src/kami_pxi.c
+++ b/build/systemMenu_RED/NandInitializerRed/ARM7.TWL/src/kami_pxi.c
@@ -186,37 +186,6 @@ static void KamiThread(void *arg)
         switch (kamiWork.command)
         {
 ////////////////////////////////////////////////////////
-        case CODEC_READ_REGISTER:
-            {
-                u8 value;
-				value = CDC_ReadSpiRegisterEx( kamiWork.data[0], kamiWork.data[1] );
-                KamiReturnResultEx(kamiWork.command, KAMI_PXI_RESULT_SUCCESS, sizeof(u8), (u8*)&value);
-            }
-            break;
-
-        case CODEC_WRITE_REGISTER:
-            {
-                CDC_WriteSpiRegisterEx( kamiWork.data[0], kamiWork.data[1], kamiWork.data[2] );
-                KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS);
-            }
-            break;
-
-        case GPIO333_WRITE:
-            {
-				if (kamiWork.data[0])
-				{
-					// GPIO333 1出力
-					EXI2i_SetBitGpio2CntL(0x8080, 0x8080);
-				}
-				else
-				{
-					// GPIO333 0出力
-					EXI2i_SetBitGpio2CntL(0x8080, 0x8000);
-				}
-                KamiReturnResult(kamiWork.command, KAMI_PXI_RESULT_SUCCESS);
-            }
-            break;
-
         case EXE_FORMAT:
             {
 				result = ExeFormat((FormatMode)kamiWork.data[0]);	// Quick or Full
diff --git a/build/systemMenu_RED/NandInitializerRed/ARM7.TWL/src/main.c b/build/systemMenu_RED/NandInitializerRed/ARM7.TWL/src/main.c
index 862a4b99..afd9cfc9 100644
--- a/build/systemMenu_RED/NandInitializerRed/ARM7.TWL/src/main.c
+++ b/build/systemMenu_RED/NandInitializerRed/ARM7.TWL/src/main.c
@@ -138,7 +138,9 @@ TwlSpMain(void)
     SPI_Init(THREAD_PRIO_SPI);
 
 ///////////////
+#ifndef NAND_INITIALIZER_LIMITED_MODE
     KamiPxiInit();
+#endif
 ///////////////
 
     while (TRUE)
diff --git a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/main.c b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/main.c
index d1c9ca55..090c6d00 100644
--- a/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/main.c
+++ b/build/systemMenu_RED/NandInitializerRed/ARM9.TWL/src/main.c
@@ -76,8 +76,10 @@ TwlMain()
     RTC_Init();
 
 	InitAllocation();
-	
+
+#ifndef NAND_INITIALIZER_LIMITED_MODE
     KamiPxiInit();   /* 独自PXI初期化 */
+#endif
 
     // Vブランク割り込み設定
     OS_SetIrqFunction(OS_IE_V_BLANK, VBlankIntr);