From 6366d977fd58be2fbb7508900d30ecb2b9d632a9 Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 23 May 2008 10:14:20 +0000
Subject: [PATCH] =?UTF-8?q?SystemUpdater=E3=81=A7DS=E3=83=8F=E3=83=83?=
 =?UTF-8?q?=E3=82=B7=E3=83=A5=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB=E3=82=82?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82?=
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@1501 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/wlanfirm/Makefile             |  4 ----
 .../SystemUpdater/ARM9.TWL/src/main.c              |  3 ++-
 build/systemMenu_tools/SystemUpdater/Makefile      | 12 +++++++++---
 build/systemMenu_tools/SystemUpdater/data/Makefile | 14 +++++++++-----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/build/systemMenu_RED/wlanfirm/Makefile b/build/systemMenu_RED/wlanfirm/Makefile
index cb1b2576..efa13242 100644
--- a/build/systemMenu_RED/wlanfirm/Makefile
+++ b/build/systemMenu_RED/wlanfirm/Makefile
@@ -35,10 +35,6 @@ MY_FIRM			=	$(MY_FIRM_ROOT_CYG)/nwm_firm.bin
 MY_VERSION_MAJOR	=	$(shell perl -e "open(IN,'$(MY_FIRM)');binmode(IN);seek(IN, 160 + 0, 0);read(IN, \$$buf, 1);print unpack("C", \$$buf);close(IN);")
 MY_VERSION_MINOR	=	$(shell perl -e "open(IN,'$(MY_FIRM)');binmode(IN);seek(IN, 160 + 1, 0);read(IN, \$$buf, 1);print unpack("C", \$$buf);close(IN);")
 
-ifeq ($(UPDATER_RELEASE),TRUE)
-MAKETAD			= $(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe
-endif
-
 MAKETAD_FLAGS	+=	0003000F484E4341 3031 $(MY_VERSION_MAJOR) WIRELESS_FW -v $(MY_VERSION_MINOR) -p
 
 #----------------------------------------------------------------------------
diff --git a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c
index 594fb56c..ef1a112c 100644
--- a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c
+++ b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c
@@ -68,7 +68,8 @@ static const char* ImportTadFileList[] =
 {
 	"rom:/data/HNAA.tad",
 	"rom:/data/HNBA.tad",
-	"rom:/data/HNCA.tad"
+	"rom:/data/HNCA.tad",
+	"rom:/data/HNHA.tad"
 };
 /*
 static const CopyFileList sCopyFileList[] =
diff --git a/build/systemMenu_tools/SystemUpdater/Makefile b/build/systemMenu_tools/SystemUpdater/Makefile
index 8318c03c..833e1cee 100644
--- a/build/systemMenu_tools/SystemUpdater/Makefile
+++ b/build/systemMenu_tools/SystemUpdater/Makefile
@@ -16,20 +16,26 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-include	$(TWLSDK_ROOT)/build/buildtools/commondefs
+TARGET_FIRM				=	SYSTEMMENU
 
+include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+# SystemUpdaterでインポートするTADは専用のmaketadでTAD化します。
+SUBDIR_FLAGS += MAKETAD=$(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe
 
 #----------------------------------------------------------------------------
 
 LAUNCHER_DIR				=	$(TWL_IPL_RED_ROOT)/build/systemMenu_RED/Launcher
 MACHINESETTINGS_DIR			=	$(TWL_IPL_RED_ROOT)/build/systemMenu_RED/MachineSettings
 WLANFIRM_DIR				=	$(TWL_IPL_RED_ROOT)/build/systemMenu_RED/wlanfirm
+DS_HASH_TABLE				=	$(TWL_IPL_RED_ROOT)/build/systemMenu_RED/DSHashTable
 SHARED_FONT_DIR				=	$(TWL_IPL_RED_ROOT)/build/systemMenu_RED/sharedFont
 NANDFIRM_DIR                =   $(TWL_IPL_RED_ROOT)/build/nandfirm/menu-launcher
 
 SUBDIRS =	$(LAUNCHER_DIR) \
 			$(MACHINESETTINGS_DIR) \
 			$(WLANFIRM_DIR) \
+			$(DS_HASH_TABLE) \
 			$(SHARED_FONT_DIR) \
 			$(NANDFIRM_DIR) \
 			data \
@@ -54,9 +60,9 @@ export SYSM_BROADON_UI		=	FALSE
 export DISABLE_DEBUG		=	TRUE
 export ENABLE_AES			=	TRUE
 
+
 #----------------------------------------------------------------------------
 
-include	$(TWLSDK_ROOT)/build/buildtools/modulerules
-
+include	$(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 
 #===== End of Makefile =====
diff --git a/build/systemMenu_tools/SystemUpdater/data/Makefile b/build/systemMenu_tools/SystemUpdater/data/Makefile
index 51d016e5..a93f79ef 100644
--- a/build/systemMenu_tools/SystemUpdater/data/Makefile
+++ b/build/systemMenu_tools/SystemUpdater/data/Makefile
@@ -22,11 +22,11 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 
 #----------------------------------------------------------------------------
-MAKETAD			= $(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe
 
 LDIRT_CLEAN		=	HNAA.tad \
 					HNBA.tad \
 					HNCA.tad \
+					HNHA.tad \
 					menu_launcher.nand
 
 #----------------------------------------------------------------------------
@@ -36,17 +36,21 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 do-build :	HNAA.tad \
 			HNBA.tad \
 			HNCA.tad \
+			HNHA.tad \
 			menu_launcher.nand
 
-HNAA.tad: ../../../systemMenu_RED/Launcher/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNAA.srl
-	$(MAKETAD) -s $< $(MAKETAD_FLAGS) -o $@
+HNAA.tad: ../../../systemMenu_RED/Launcher/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNAA.tad
+	cp $< ./$@
 
-HNBA.tad: ../../../systemMenu_RED/MachineSettings/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNBA.srl
-	$(MAKETAD) -s $< $(MAKETAD_FLAGS) -o $@
+HNBA.tad: ../../../systemMenu_RED/MachineSettings/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNBA.tad
+	cp $< ./$@
 
 HNCA.tad: ../../../systemMenu_RED/wlanfirm/HNCA.tad
 	cp $< ./$@
 
+HNHA.tad: ../../../systemMenu_RED/DSHashTable/HNHA.tad
+	cp $< ./$@
+
 menu_launcher.nand: ../../../nandfirm/menu-launcher/menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand
 	cp $< ./$@