From 6e32be5282332a5bccf9967545eca54427a9505c Mon Sep 17 00:00:00 2001 From: yosiokat Date: Tue, 27 May 2008 02:17:06 +0000 Subject: [PATCH] =?UTF-8?q?SystemUpdater=E7=94=A8=E3=81=AEmaketad.updater?= =?UTF-8?q?=E3=81=A7=E4=BD=9C=E6=88=90=E3=81=97=E3=81=9FTAD=E3=81=8CSystem?= =?UTF-8?q?Updater/data=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E5=86=85?= =?UTF-8?q?=E3=81=AE=E3=81=BF=E3=81=A7=E7=94=9F=E6=88=90=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=20=E3=82=88=E3=81=86=E3=81=AB=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=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@1531 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/systemMenu_RED/DSHashTable/Makefile | 36 +++++-------------- .../DSHashTable/commondefs.DSHashTable | 35 ++++++++++++++++++ build/systemMenu_RED/wlanfirm/Makefile | 25 ++++--------- .../wlanfirm/commondefs.wlanfirm | 29 +++++++++++++++ build/systemMenu_tools/SystemUpdater/Makefile | 3 -- .../SystemUpdater/data/Makefile | 21 +++++++---- 6 files changed, 94 insertions(+), 55 deletions(-) create mode 100644 build/systemMenu_RED/DSHashTable/commondefs.DSHashTable create mode 100644 build/systemMenu_RED/wlanfirm/commondefs.wlanfirm diff --git a/build/systemMenu_RED/DSHashTable/Makefile b/build/systemMenu_RED/DSHashTable/Makefile index 2b23f05b..6e23da63 100644 --- a/build/systemMenu_RED/DSHashTable/Makefile +++ b/build/systemMenu_RED/DSHashTable/Makefile @@ -18,40 +18,20 @@ TARGET_FIRM = SYSTEMMENU -override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM -override TWL_ARCHGEN := LIMITED +override TARGET_PLATFORM := TWL include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include ./commondefs.DSHashTable -MY_TITLE = HNHA - -MY_DATA = DSHashTable.bin - -#MY_TITLE_NAME = $(MY_TITLE) -MY_TITLE_NAME = DSHashTable - +MY_DATA = $(DS_HASH_TABLE_DATA) #---------------------------------------------------------------------------- -MY_TAD = $(MY_TITLE).tad +MY_TAD = $(MY_TITLE).tad -MY_TITLE_ID_HI = 0003000F -MY_TITLE_ID_LO = $(shell perl -e 'printf "%02X%02X%02X%02X", unpack("C4", "'$(MY_TITLE)'")') -MY_TITLE_ID = $(MY_TITLE_ID_HI)$(MY_TITLE_ID_LO) -MY_GROUP_ID = 3031 +#INSTALL_TARGETS = $(MY_TAD) +#INSTALL_DIR = -MY_VERSION = $(shell perl -e 'open IN, "$(MY_DATA)"; binmode IN; seek IN, 132, 0; read IN, $$buf, 2; print unpack "S", $$buf; close IN') - -MY_MAJOR_VERSION = $(shell expr $(MY_VERSION) / 256) -MY_MINOR_VERSION = $(shell expr $(MY_VERSION) % 256) - -INSTALL_TARGETS = $(MY_TAD) -INSTALL_DIR = $(ROOT)/build/tools/TwlNMenu/data - -MAKETAD_FLAGS = -d $(MY_TITLE_ID) $(MY_GROUP_ID) $(MY_MAJOR_VERSION) $(MY_TITLE_NAME) \ - -v $(MY_MINOR_VERSION) -p - -LDIRT_CLEAN = $(MY_TAD) +LDIRT_CLEAN = $(MY_TAD) #---------------------------------------------------------------------------- @@ -60,6 +40,6 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules do-build : $(MY_TAD) $(MY_TAD): $(MY_DATA) - $(MAKETAD) $(call empath,$<) $(MAKETAD_FLAGS) -o $@ + $(MAKETAD) $(call empath,$<) $(DS_HASH_TABLE_MAKETAD_OPTION) -o $@ #===== End of Makefile ===== diff --git a/build/systemMenu_RED/DSHashTable/commondefs.DSHashTable b/build/systemMenu_RED/DSHashTable/commondefs.DSHashTable new file mode 100644 index 00000000..a320a2eb --- /dev/null +++ b/build/systemMenu_RED/DSHashTable/commondefs.DSHashTable @@ -0,0 +1,35 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile - +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, 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: +#---------------------------------------------------------------------------- + +DS_HASH_TABLE_TITLE_NAME = DSHashTable +DS_HASH_TABLE_DATA_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/DSHashTable +DS_HASH_TABLE_DATA = $(DS_HASH_TABLE_DATA_DIR)/$(DS_HASH_TABLE_TITLE_NAME).bin +DS_HASH_TABLE_TITLE = HNHA +DS_HASH_TABLE_TITLE_ID_HI = 0003000F +DS_HASH_TABLE_TITLE_ID_LO = $(shell perl -e 'printf "%02X%02X%02X%02X", unpack("C4", "'$(DS_HASH_TABLE_TITLE)'")') +DS_HASH_TABLE_TITLE_ID = $(DS_HASH_TABLE_TITLE_ID_HI)$(DS_HASH_TABLE_TITLE_ID_LO) + +DS_HASH_TABLE_GROUP_ID = 3031 + +DS_HASH_TABLE_VERSION = $(shell perl -e 'open IN, "$(DS_HASH_TABLE_DATA)"; binmode IN; seek IN, 132, 0; read IN, $$buf, 2; print unpack "S", $$buf; close IN') + +DS_HASH_TABLE_MAJOR_VERSION = $(shell expr $(DS_HASH_TABLE_VERSION) / 256) +DS_HASH_TABLE_MINOR_VERSION = $(shell expr $(DS_HASH_TABLE_VERSION) % 256) + +DS_HASH_TABLE_MAKETAD_OPTION = -s -d $(DS_HASH_TABLE_TITLE_ID) $(DS_HASH_TABLE_GROUP_ID) $(DS_HASH_TABLE_MAJOR_VERSION) $(DS_HASH_TABLE_TITLE_NAME) \ + -v $(DS_HASH_TABLE_MINOR_VERSION) -p diff --git a/build/systemMenu_RED/wlanfirm/Makefile b/build/systemMenu_RED/wlanfirm/Makefile index efa13242..5085cdda 100644 --- a/build/systemMenu_RED/wlanfirm/Makefile +++ b/build/systemMenu_RED/wlanfirm/Makefile @@ -16,32 +16,21 @@ # $Author: #---------------------------------------------------------------------------- -TARGET_FIRM = SYSTEMMENU - +TARGET_FIRM = SYSTEMMENU override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM -override TWL_ARCHGEN := LIMITED + include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MY_FIRM_ROOT = $(TWLWIRELESS_ROOT)/binfile - -MY_FIRM_ROOT_CYG = $(call eupath,$(MY_FIRM_ROOT)) +include ./commondefs.wlanfirm MY_TITLE = HNCA -MY_FIRM = $(MY_FIRM_ROOT_CYG)/nwm_firm.bin - -# FWファイルの先頭1バイトに入っているバージョン情報を取得 -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);") - -MAKETAD_FLAGS += 0003000F484E4341 3031 $(MY_VERSION_MAJOR) WIRELESS_FW -v $(MY_VERSION_MINOR) -p #---------------------------------------------------------------------------- MY_TAD = $(MY_TITLE).tad -INSTALL_TARGETS = $(MY_TAD) -INSTALL_DIR = $(ROOT)/build/tools/TwlNMenu/data +#INSTALL_TARGETS = +#INSTALL_DIR = LDIRT_CLEAN = $(MY_TAD) @@ -51,7 +40,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules do-build : $(MY_TAD) -$(MY_TAD): $(MY_FIRM) - $(MAKETAD) $(call empath,$<) -s -d $(MAKETAD_FLAGS) -o $@ +$(MY_TAD): $(MY_WLANFIRM) + $(MAKETAD) $(call empath,$<) $(WLANFIRM_MAKETAD_OPTION) -o $@ #===== End of Makefile ===== diff --git a/build/systemMenu_RED/wlanfirm/commondefs.wlanfirm b/build/systemMenu_RED/wlanfirm/commondefs.wlanfirm new file mode 100644 index 00000000..9124a716 --- /dev/null +++ b/build/systemMenu_RED/wlanfirm/commondefs.wlanfirm @@ -0,0 +1,29 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: commondefs.wlanfirm - +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, 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: +#---------------------------------------------------------------------------- + +MY_WLANFIRM_ROOT = $(TWLWIRELESS_ROOT)/binfile +MY_WLANFIRM_ROOT_CYG = $(call eupath,$(MY_WLANFIRM_ROOT)) + +MY_WLANFIRM = $(MY_WLANFIRM_ROOT_CYG)/nwm_firm.bin + +# FWファイルの先頭1バイトに入っているバージョン情報を取得 +MY_WLANFIRM_VERSION_MAJOR = $(shell perl -e "open(IN,'$(MY_WLANFIRM)');binmode(IN);seek(IN, 160 + 0, 0);read(IN, \$$buf, 1);print unpack("C", \$$buf);close(IN);") +MY_WLANFIRM_VERSION_MINOR = $(shell perl -e "open(IN,'$(MY_WLANFIRM)');binmode(IN);seek(IN, 160 + 1, 0);read(IN, \$$buf, 1);print unpack("C", \$$buf);close(IN);") + +WLANFIRM_MAKETAD_OPTION += -s -d 0003000F484E4341 3031 $(MY_WLANFIRM_VERSION_MAJOR) WIRELESS_FW -v $(MY_WLANFIRM_VERSION_MINOR) -p + diff --git a/build/systemMenu_tools/SystemUpdater/Makefile b/build/systemMenu_tools/SystemUpdater/Makefile index 833e1cee..6927aa78 100644 --- a/build/systemMenu_tools/SystemUpdater/Makefile +++ b/build/systemMenu_tools/SystemUpdater/Makefile @@ -20,9 +20,6 @@ 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 diff --git a/build/systemMenu_tools/SystemUpdater/data/Makefile b/build/systemMenu_tools/SystemUpdater/data/Makefile index a93f79ef..d1ac7842 100644 --- a/build/systemMenu_tools/SystemUpdater/data/Makefile +++ b/build/systemMenu_tools/SystemUpdater/data/Makefile @@ -19,7 +19,13 @@ TARGET_FIRM = SYSTEMMENU include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include $(SYSMENU_ROOT)/build/systemMenu_RED/wlanfirm/commondefs.wlanfirm +include $(SYSMENU_ROOT)/build/systemMenu_RED/DSHashTable/commondefs.DSHashTable +# SystemUpdaterでインポートするTADは専用のmaketadでTAD化します。 +MAKETAD := $(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe + +MAKETAD_OPTION += -s #---------------------------------------------------------------------------- @@ -39,17 +45,20 @@ do-build : HNAA.tad \ HNHA.tad \ menu_launcher.nand -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.tad - cp $< ./$@ +# maketad.updaterで作られたTADが他のフォルダに残らないように、ここでTAD化処理する。 + +HNAA.tad: ../../../systemMenu_RED/Launcher/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNAA.srl + $(MAKETAD) $< $(MAKETAD_OPTION) -o $@ + +HNBA.tad: ../../../systemMenu_RED/MachineSettings/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNBA.srl + $(MAKETAD) $< $(MAKETAD_OPTION) -o $@ HNCA.tad: ../../../systemMenu_RED/wlanfirm/HNCA.tad - cp $< ./$@ + $(MAKETAD) $< $(WLANFIRM_MAKETAD_OPTION) -o $@ HNHA.tad: ../../../systemMenu_RED/DSHashTable/HNHA.tad - cp $< ./$@ + $(MAKETAD) $< $(DS_HASH_TABLE_MAKETAD_OPTION) -o $@ menu_launcher.nand: ../../../nandfirm/menu-launcher/menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand cp $< ./$@