From cefac7b2d1534fe1c024dbda3bda50292a5f31e6 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 13 Jul 2009 08:31:21 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=AE=E6=95=B4?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2871 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../NandFirmWriter/ARM9.TWL/Makefile          | 40 +------------------
 .../NandFirmWriter/ARM9.TWL/main.rsf          |  9 ++---
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
index 9ee42b54..8501e698 100644
--- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
+++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/Makefile
@@ -13,35 +13,10 @@
 #
 # $Date:: 2009-03-11#$
 # $Rev: 2763 $
-# $Author: aoki_ryoma $
+# $Author: akabane_jumpei $
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-
-#============================================================================
-#製品鍵を使った書き込みを行う場合は、TwlIPL/build/buildtools/commondefsの"FIRM_USE_PRODUCT_KEYS=TRUE"を有効にしてください。
-#============================================================================
-#============================================================================
-# ワイヤレスの強制Disableフラグを設定可能にする場合定義します。（要:Make Clean）
-# MACRO_FLAGS				+=	-DUSE_WIRELESS_FORCE_DISABLE_SETTING
-#============================================================================
-#============================================================================
-# 各種データを書き込み可能にする場合定義します。（要:Make Clean）
-# 具体的には TWLFontTable.dat wrap.bin cert.sys の3つです。
-# MACRO_FLAGS				+=	-DUSE_WRITE_VARIOUS_DATA
-#============================================================================
-#============================================================================
-# dev.kpを書き込み可能にする場合定義します。（要:Make Clean）
-#MACRO_FLAGS				+=	-DWRITE_DEVKP_ENABLE
-#============================================================================
-#============================================================================
-# マリクラデバッグ用として作成する場合定義します。（要:Make Clean）
-# ・自動処理において"nand:/shared2/launcher/wrap.bin"を作成します。
-# ・自動処理において開発用CLSの証明書(cert.sys)を書き込みます。
-# ・自動処理の最後に本体初期化を行います。
-#MACRO_FLAGS				+=	-DMARIOCLUB_VERSION
-#============================================================================
-
 SYSM_DISABLE_DEBUG	= FALSE
 
 TARGET_FIRM			= SYSTEMMENU
@@ -82,20 +57,7 @@ SRCDIR				=	src \
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
-
-#ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),)
-#ifdef FIRM_USE_PRODUCT_KEYS
-#MAKEROM_FLAGS			+=	-DHWINFO_PRIVKEY='private_HWInfo.der' \
-#							-DHWID_PRIVKEY='private_HWID.der'
-#else
-#MAKEROM_FLAGS			+=	-DHWINFO_PRIVKEY='private_HWInfo_dev.der' \
-#							-DHWID_PRIVKEY='private_HWID_dev.der'
-#endif
-#endif
-
 MAKEROM_FLAGS			+=	-DTITLEID_LO='$(TITLEID_LO)' \
-							-DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \
-							-DCARD_REGION='$(CARD_REGION)' \
 							-DDISABLE_DEBUG='$(SYSM_DISABLE_DEBUG)'
 
 MAKETAD_FLAGS			+=	-s
diff --git a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/main.rsf b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/main.rsf
index 836d36f3..aa90c945 100644
--- a/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/main.rsf
+++ b/build/systemMenu_tools/NandFirmWriter/ARM9.TWL/main.rsf
@@ -223,10 +223,7 @@ RomSpec
 {
 	Offset		0x00000000
 	Segment		ALL
-	HostRoot	$(TWL_IPL_RED_ROOT)/build/systemMenu_tools/NandInitializerRed/data
-	Root		/data
-	File		cert.sys
-	HostRoot	$(PRIVKEY_PATH)
-	Root		/key
-	File		$(HWINFO_PRIVKEY) $(HWID_PRIVKEY)
+	HostRoot	$(MAKEROM_ROMROOT)
+	Root		/
+	File		$(MAKEROM_ROMFILES)
 }