From 2a447ba30d43aed71630e2654ccfdd5659a6a3ef Mon Sep 17 00:00:00 2001 From: kamikawa Date: Thu, 18 Dec 2008 12:17:55 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81SKPI=5FWRITE=5FHWINFO?= =?UTF-8?q?=E5=8F=8A=E3=81=B3USE=5FNORMAL=5FCOMMON=5FDEY=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=80=82readme=E3=82=92=E6=9B=B4=E6=96=B0=E3=80=82=20?= =?UTF-8?q?=EF=BC=88=E8=A3=BD=E5=93=81=E6=8A=80=E8=A1=93=E9=83=A8=E3=83=AD?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=EF=BC=A7?= =?UTF-8?q?=E3=81=8CSysMenu=E3=81=AE=E3=83=8D=E3=83=83=E3=83=88=E3=83=AF?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=82=92=E3=83=86=E3=82=B9=E3=83=88=E3=81=99=E3=82=8B?= =?UTF-8?q?=E5=89=8D=E3=81=AB=E5=8F=A4=E3=81=84SysMenu=E3=82=92=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E3=81=8C=E3=81=82=E3=82=8B=E3=81=9F=E3=82=81=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=EF=BC=89?= 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@2717 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../ARM9.TWL/Makefile | 19 ++++++++++++++ .../ARM9.TWL/main.rsf | 4 +-- .../ARM9.TWL/src/process_hwinfo.c | 4 +++ .../ARM9.TWL/src/process_import.c | 5 ++-- .../ARM9.TWL/src/process_select_region.c | 8 +++++- .../SystemUpdaterRegionSelect/readme.txt | 26 +++++++++++++++++++ 6 files changed, 61 insertions(+), 5 deletions(-) diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile index a100c1d8..111bda18 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/Makefile @@ -25,6 +25,8 @@ UPDATER_HOST_ROOT_DIR = ../data_sysmenu # COMPILE SWITCH for build SystemUpdater IGNORE_VERSION_CHECK ?= FALSE +SKIP_WRITE_HWINFO ?= FALSE +USE_NORMAL_COMMON_KEY ?= FALSE # MAKEROM SWITCH for build SystemUpdater SYSM_DISABLE_DEBUG ?= TRUE @@ -92,6 +94,10 @@ SRCDIR = src \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +ifeq ($(SKIP_WRITE_HWINFO),TRUE) +MAKEROM_FLAGS += -DHWINFO_PRIVKEY='' \ + -DHWID_PRIVKEY='' +else ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) ifdef FIRM_USE_PRODUCT_KEYS MAKEROM_FLAGS += -DHWINFO_PRIVKEY='private_HWInfo.der' \ @@ -101,11 +107,24 @@ MAKEROM_FLAGS += -DHWINFO_PRIVKEY='private_HWInfo_dev.der' \ -DHWID_PRIVKEY='private_HWID_dev.der' endif endif +endif ifeq ($(IGNORE_VERSION_CHECK),TRUE) MACRO_FLAGS += -DIGNORE_VERSION_CHECK endif +ifeq ($(SKIP_WRITE_HWINFO),TRUE) +MACRO_FLAGS += -DSKIP_WRITE_HWINFO +endif + +ifeq ($(USE_NORMAL_COMMON_KEY),TRUE) +MAKEROM_FLAGS += -DComClientKey='TRUE' \ + -DComClientKeyDebugger='FALSE' +else +MAKEROM_FLAGS += -DComClientKey='FALSE' \ + -DComClientKeyDebugger='TRUE' +endif + MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \ -DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \ -DCARD_REGION='$(CARD_REGION)' \ diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/main.rsf b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/main.rsf index fcde861c..0ff0aecb 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/main.rsf +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/main.rsf @@ -124,8 +124,8 @@ Property # CommonClientKey: launcher deliver common client Key [TRUE/FALSE] # # ========= SystemUpdaterは特別な鍵を使う ========= - #CommonClientKey TRUE - CommonClientKeyForDebugger TRUE + CommonClientKey $(ComClientKey) + CommonClientKeyForDebugger $(ComClientKeyDebugger) # # HwAESSlotB: launcher deliver HW AES slot B setting [TRUE/FALSE] diff --git a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_hwinfo.c b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_hwinfo.c index a831cfa8..58a72a7b 100644 --- a/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_hwinfo.c +++ b/build/systemMenu_tools/SystemUpdaterRegionSelect/ARM9.TWL/src/process_hwinfo.c @@ -63,6 +63,10 @@ BOOL ProcessHwinfo(void) BOOL hw_info_result; int i; +#ifdef SKIP_WRITE_HWINFO + return TRUE; +#endif + // 全ハードウェア情報の更新 for (i=0;i 上記以外でALLリージョンでないtad $ -> 上記以外のtad 及び nandファーム 及び フォントデータ + +/*-----------------------------------------------------*/ +/* コンパイルスイッチについて */ +/*-----------------------------------------------------*/ + + +-----------------------+--------+--------------------+----------------------------------------+ + l l 通常 l Lot Check Group 用 l 説明 l + +-----------------------+--------+--------------------+----------------------------------------+ + l IGNORE_VERSION_CHECK l FALSE l TRUE l TRUEならバージョンダウン可能 l + +-----------------------+--------+--------------------+----------------------------------------+ + l SKIP_WRITE_HWINFO l FALSE l TRUE l TRUEならハードウェア情報を更新しない l + +-----------------------+--------+--------------------+----------------------------------------+ + l USE_NORMAL_COMMON_KEY l FALSE l TRUE l TRUEなら通常のcommon client key を使用 l + +-----------------------+--------+--------------------+----------------------------------------+ + +※ [通常]は開発者へリリースする目的のもの +※ [Lot Check Group 用]はSystemMenuのロットチェックでネットワークアップデートのテストを + 行うために一旦SystemMenuを古いものに入れ替えるためのもの