diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c index da75b360..3e9f632a 100644 --- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c @@ -200,6 +200,7 @@ BOOL BOOT_WaitStart( void ) AESi_ResetAesKeyA(); if( isClearSlotB ) AESi_ResetAesKeyB(); if( isClearSlotC ) AESi_ResetAesKeyC(); +// if( th->s.access_control.nand_access == 0 ) AESi_ResetAeskeyD(); // NANDにアクセスしないアプリは、スロットDの鍵をクリアする // 鍵は不要になるので、消しておく { diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 738e0adb..7cbc7dfe 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -17,9 +17,9 @@ #---------------------------------------------------------------------------- SUBDIRS = \ - ../../../libraries_sysmenu/sysmenu \ - ../../../libraries_sysmenu/hotsw \ - ../../../components/hyena.TWL +# ../../../libraries_sysmenu/sysmenu \ +# ../../../libraries_sysmenu/hotsw \ +# ../../../components/hyena.TWL # ../../../libraries_sysmenu/reloc_info \ # ../../../libraries_sysmenu/boot \ # ../../../libraries_sysmenu/mcu \ @@ -28,7 +28,11 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -#FIRM_BUILD = TRUE +ifdef SDK_FINALROM +DISABLE_DEBUG = TRUE +else +DISABLE_DEBUG = FALSE +endif TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL @@ -77,12 +81,10 @@ ADDRESS_DTCM = 0x0e000000 DEFAULT_COMP_ARM7 = hyena -MAKEROM_FLAGS += -F -DTITLEID_LO='$(TITLEID_LO)' -DCARD_REGION='$(CARD_REGION)' -ifdef FIRM_BUILD -MAKEROM_FLAGS += -s \ - -DSYS_PRIV_KEY=$(TWL_KEYSDIR)/rsa/private9_0.der \ - -DSYS_PUB_KEY=$(TWL_KEYSDIR)/rsa/public9_0.der -endif +MAKEROM_FLAGS += -F \ + -DTITLEID_LO='$(TITLEID_LO)' \ + -DCARD_REGION='$(CARD_REGION)' \ + -DDISABLE_DEBUG='$(DISABLE_DEBUG)' MAKETAD_FLAGS += -s diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf index 19e67ebc..817df643 100644 --- a/build/systemMenu_RED/Launcher/ARM9/main.rsf +++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf @@ -144,6 +144,11 @@ Property # #SDCardAccess TRUE + # + # DisableDebug :最終ROMでは、アプリジャンプされた際にデバッグできないようにTRUEにする必要があります。 + # + DisableDebug $(DISABLE_DEBUG) + ### #### END } diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index e9dfdd2b..a44f3720 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -22,6 +22,12 @@ SUBDIRS = \ #---------------------------------------------------------------------------- +ifdef SDK_FINALROM +DISABLE_DEBUG = TRUE +else +DISABLE_DEBUG = FALSE +endif + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED @@ -52,7 +58,9 @@ SRCS = main.c MachineSetting.c \ LINCLUDES = $(MISC_DIR)/include -MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' -DCARD_REGION='$(CARD_REGION)' +MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' \ + -DCARD_REGION='$(CARD_REGION)' \ + -DDISABLE_DEBUG='$(DISABLE_DEBUG)' MAKETAD_FLAGS += -s diff --git a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf index aace337a..b205c065 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf +++ b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf @@ -140,6 +140,11 @@ Property # HwAESSlotC TRUE + # + # NANDAccess: nand access control [TRUE/FALSE] + # + NANDAccess TRUE + # # SDCardAccess: sd card access control [TRUE/FALSE] # @@ -151,6 +156,11 @@ Property # CodecMode $(MAKEROM_CODEC_MODE) + # + # DisableDebug :最終ROMでは、アプリジャンプされた際にデバッグできないようにTRUEにする必要があります。 + # + DisableDebug $(DISABLE_DEBUG) + ### #### END } diff --git a/docs/X4繝懊シ繝牙ッセ蠢/X4繝懊シ繝臥畑繝ゥ繝ウ繝√Ε繝シ繝√ぉ繝繧ッ陦ィ.xls b/docs/X4繝懊シ繝牙ッセ蠢/X4繝懊シ繝臥畑繝ゥ繝ウ繝√Ε繝シ繝√ぉ繝繧ッ陦ィ.xls index 4fbc56f1..7d491c23 100644 Binary files a/docs/X4繝懊シ繝牙ッセ蠢/X4繝懊シ繝臥畑繝ゥ繝ウ繝√Ε繝シ繝√ぉ繝繧ッ陦ィ.xls and b/docs/X4繝懊シ繝牙ッセ蠢/X4繝懊シ繝臥畑繝ゥ繝ウ繝√Ε繝シ繝√ぉ繝繧ッ陦ィ.xls differ diff --git a/docs/format_ROM_Header.xls b/docs/format_ROM_Header.xls index 2c734452..b1e251e9 100644 Binary files a/docs/format_ROM_Header.xls and b/docs/format_ROM_Header.xls differ diff --git a/docs/骰オ邂。逅.xls b/docs/骰オ邂。逅.xls index cb7dbc88..e7a7f1f9 100644 Binary files a/docs/骰オ邂。逅.xls and b/docs/骰オ邂。逅.xls differ diff --git a/tools/bin/makerom.TWL.launcher.exe b/tools/bin/makerom.TWL.launcher.exe index 332fc2d8..50d54c10 100644 Binary files a/tools/bin/makerom.TWL.launcher.exe and b/tools/bin/makerom.TWL.launcher.exe differ