From e1b83f6240e087b2cc53ffdd0d02e8ed1123e773 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Wed, 28 May 2008 00:42:03 +0000 Subject: [PATCH] =?UTF-8?q?TwlIPL=5FSDK500fc=5Fplus3=5Fbranch=E3=83=96?= =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=81=AE=E5=86=85=E5=AE=B9=E3=82=92?= =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=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@1543 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../sysmenu/ARM9/src/sysmenu_lib.c | 5 +++++ build/systemMenu_RED/DSHashTable/Makefile | 2 ++ build/systemMenu_RED/Launcher/ARM9/Makefile | 2 +- build/systemMenu_RED/Launcher/ARM9/src/main.c | 9 +++++---- .../SystemUpdater/ARM9.TWL/Makefile | 3 +++ build/systemMenu_tools/SystemUpdater/Makefile | 1 + .../SystemUpdater/data/Makefile | 4 ++-- docs/format_ROM_Header.xls | Bin 93184 -> 93184 bytes 8 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index f0eb3551..c2533f95 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -306,6 +306,11 @@ TitleProperty *SYSM_ReadParameters( void ) // 本体設定データなどのメモリ展開。 static void SYSMi_CopyLCFGData( u32 dst_addr ) { + // HotStart時にも保持する必要のあるデータをランチャー用に移動するプリロードパラメータバッファにコピー。 + MI_CpuCopy8( (void *)HW_PARAM_WIRELESS_FIRMWARE_DATA, (void *)(dst_addr + HW_PARAM_TWL_SETTINGS_DATA_SIZE), + HW_PARAM_WIRELESS_FIRMWARE_DATA_SIZE ); // 無線ファーム用 + + // プリロードパラメータアドレスをランチャー向けに変更。 *(u32 *)HW_PRELOAD_PARAMETER_ADDR = dst_addr; // 本体設定データ、HWノーマル情報、HWセキュア情報をメモリに展開しておく diff --git a/build/systemMenu_RED/DSHashTable/Makefile b/build/systemMenu_RED/DSHashTable/Makefile index 6e23da63..7e3c8d63 100644 --- a/build/systemMenu_RED/DSHashTable/Makefile +++ b/build/systemMenu_RED/DSHashTable/Makefile @@ -25,6 +25,8 @@ include ./commondefs.DSHashTable MY_DATA = $(DS_HASH_TABLE_DATA) +MY_TITLE = $(DS_HASH_TABLE_TITLE) + #---------------------------------------------------------------------------- MY_TAD = $(MY_TITLE).tad diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 2cc4ad72..c9a630aa 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -40,7 +40,7 @@ export DISABLE_WDS_SCAN = TRUE export DISABLE_WLFIRM_LOAD = FALSE export IGNORE_WLFIRM_SIGNCHECK = FALSE export DISABLE_SLEEP = TRUE - +export AUTH_NTR_CARD_PRODUCT_ONLY = TRUE endif # MAKEROM SWITCH ※最終ROM作成時は、全てTRUEにセットする diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index a011aaaa..3959efa0 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -301,11 +301,12 @@ void TwlMain( void ) } break; case LOAD_START: - SYSM_StartLoadTitle( pBootTitle ); - state = LOADING; - - start = OS_GetTick(); + if( IsFinishedLoadSharedFont() ) { // ダイレクトブートの時があるので、フォントロード終了をここでチェック + SYSM_StartLoadTitle( pBootTitle ); + state = LOADING; + start = OS_GetTick(); + } break; case LOADING: if( SYSM_IsLoadTitleFinished() ) { diff --git a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile index aec3297e..666d5507 100644 --- a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile @@ -87,6 +87,9 @@ MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \ -DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \ -DCARD_REGION='$(CARD_REGION)' \ -DDISABLE_DEBUG='$(DISABLE_DEBUG)' + +MAKEROM_FLAGS := $(filter-out -a,$(MAKEROM_FLAGS)) + MAKETAD_FLAGS += -s SYSMENU_LIBS = \ diff --git a/build/systemMenu_tools/SystemUpdater/Makefile b/build/systemMenu_tools/SystemUpdater/Makefile index 6927aa78..e17cc8a3 100644 --- a/build/systemMenu_tools/SystemUpdater/Makefile +++ b/build/systemMenu_tools/SystemUpdater/Makefile @@ -52,6 +52,7 @@ export DISABLE_WLFIRM_LOAD = FALSE export DISABLE_SLEEP = FASLE export SYSM_OUTSIDE_UI = TRUE export SYSM_BROADON_UI = FALSE +export AUTH_NTR_CARD_PRODUCT_ONLY = TRUE # MAKEROM SWITCH for build SystemMenu export DISABLE_DEBUG = TRUE diff --git a/build/systemMenu_tools/SystemUpdater/data/Makefile b/build/systemMenu_tools/SystemUpdater/data/Makefile index d1ac7842..fc51d97c 100644 --- a/build/systemMenu_tools/SystemUpdater/data/Makefile +++ b/build/systemMenu_tools/SystemUpdater/data/Makefile @@ -54,10 +54,10 @@ HNAA.tad: ../../../systemMenu_RED/Launcher/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR) 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 +HNCA.tad: $(call empath,$(MY_WLANFIRM)) $(MAKETAD) $< $(WLANFIRM_MAKETAD_OPTION) -o $@ -HNHA.tad: ../../../systemMenu_RED/DSHashTable/HNHA.tad +HNHA.tad: $(call empath,$(DS_HASH_TABLE_DATA)) $(MAKETAD) $< $(DS_HASH_TABLE_MAKETAD_OPTION) -o $@ menu_launcher.nand: ../../../nandfirm/menu-launcher/menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand diff --git a/docs/format_ROM_Header.xls b/docs/format_ROM_Header.xls index 676174d8aacc6ed1dc13627d11cd27b0ecddb12b..203a1258c828794463978c98cf2b2c154e6a169d 100644 GIT binary patch delta 26 gcmZp;!P)>sTNrb)I4-RG5Vc|d3C8UuS&Ti50H+uW>;M1& delta 21 bcmZp;!P)>sTNrb)Ci}*7Y%j@T>|q1|V{`~G