diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile index 8590df38..34a378a7 100644 --- a/build/components/hyena.TWL/Makefile +++ b/build/components/hyena.TWL/Makefile @@ -72,6 +72,11 @@ MAKELCF_FLAGS += -DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libs -DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a' +ifeq ($(LAUNCHER_DEBUG_MODE),TRUE) +MACRO_FLAGS += -DLAUNCHER_DEBUG_MODE +endif + + #-------------------------------- # install target #-------------------------------- diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c index de5578cb..10dbd773 100644 --- a/build/components/hyena.TWL/src/main.c +++ b/build/components/hyena.TWL/src/main.c @@ -181,9 +181,13 @@ TwlSpMain(void) InitializeNwm(mainHeapHandle, mainHeapHandle); // NWM 初期化 #ifndef SDK_NOCRYPTO AES_Init(); // AES 初期化 + +#if ( defined(LAUNCHER_DEBUG_MODE) && defined(SDK_RELEASE) ) + MI_CpuCopyFast( (void *)HW_LAUNCHER_DELIVER_PARAM_BUF, (void *)SDK_SEA_KEY_STORE, HW_LAUNCHER_DELIVER_PARAM_BUF_SIZE ); +#else + SYSMi_SetAESKeysForAccessControlCore( (ROM_Header *)HW_TWL_ROM_HEADER_BUF, (u8 *)SDK_SEA_KEY_STORE, NULL, NULL ); +#endif - //SYSMi_SetAESKeysForAccessControlCore( (ROM_Header *)HW_TWL_ROM_HEADER_BUF, (u8 *)SDK_SEA_KEY_STORE, NULL, NULL ); - MI_CpuCopyFast( (void *)0x0380f000, (u8 *)SDK_SEA_KEY_STORE, 0x40 ); #ifdef SDK_SEA SEA_Init(); #endif // ifdef SDK_SEA diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 1816f70c..58754ed9 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -553,7 +553,9 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode, for (i = region_header; i < region_max; ++i) { +#ifdef LOAD_APP_VIA_WRAM BOOL result; +#endif u32 len = MATH_ROUNDUP( length[i], SYSM_ALIGNMENT_LOAD_MODULE );// AES暗号化領域の関係で、ロードサイズは32バイトアライメントに補正 if ( !isTwlApp && i >= region_arm9_twl ) continue;// nitroでは読み込まない領域 diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index e605d2b1..e3db3acf 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -19,8 +19,8 @@ # ※コンパイルスイッチの都合上、../../../libraries_sysmenu/sysmenu は有効にしておく SUBDIRS = \ ../../../libraries_sysmenu/sysmenu \ -# ../../../libraries_sysmenu/boot \ -# ../../../components/hyena.TWL + ../../../libraries_sysmenu/boot \ + ../../../components/hyena.TWL # ../../../libraries_sysmenu/hotsw \ # ../../../libraries_sysmenu/reloc_info \ # ../../../libraries_sysmenu/mcu \ @@ -32,9 +32,10 @@ SUBDIRS = \ ifneq ($(UPDATER_RELEASE),TRUE) # COMPILE SWITCH ※最終ROM作成時は、全てFALSEにセットする。SUBDIRのビルド時にも影響するようexportで環境変数設定する。 +export LAUNCHER_DEBUG_MODE = TRUE export DO_NOT_SHOW_LAUNCHER = FALSE export DISABLE_WDS_SCAN = TRUE -export DISABLE_WLFIRM_LOAD = TRUE +export DISABLE_WLFIRM_LOAD = FALSE export IGNORE_WLFIRM_SIGNCHECK = FALSE export DISABLE_SLEEP = TRUE @@ -97,6 +98,9 @@ ADDRESS_DTCM = 0x0e000000 DEFAULT_COMP_ARM7 = hyena +#---------------------------------------------------------------------------- +# Append Flags + MAKEROM_FLAGS += -F \ -DTITLEID_LO='$(TITLEID_LO)' \ -DCARD_REGION='$(CARD_REGION)' \ @@ -135,6 +139,8 @@ else MAKEROM_FLAGS += -DDS_HASH_TABLE_DIR=data endif +#---------------------------------------------------------------------------- + include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index 803682b9..06b777ca 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -24,8 +24,8 @@ SUBDIRS = \ # COMPILE SWITCH ※最終ROM作成時は、全てFALSEにセットする。 -OUTSIDE_UI ?= FALSE -BROADON_UI ?= FALSE +SYSM_OUTSIDE_UI ?= FALSE +SYSM_BROADON_UI ?= FALSE # MAKEROM SWITCH ※最終ROM作成時は、TRUEにする @@ -77,11 +77,11 @@ LLIBRARIES = libes$(TWL_LIBSUFFIX).a \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -ifeq ($(OUTSIDE_UI),TRUE) +ifeq ($(SYSM_OUTSIDE_UI),TRUE) MACRO_FLAGS += -DOUTSIDE_UI endif -ifeq ($(BROADON_UI),TRUE) +ifeq ($(SYSM_BROADON_UI),TRUE) MACRO_FLAGS += -DBROADON_UI endif diff --git a/build/systemMenu_RED/SystemUpdater/Makefile b/build/systemMenu_RED/SystemUpdater/Makefile index 01737168..d079b6b9 100644 --- a/build/systemMenu_RED/SystemUpdater/Makefile +++ b/build/systemMenu_RED/SystemUpdater/Makefile @@ -38,11 +38,15 @@ SUBDIRS = $(LAUNCHER_DIR) \ export UPDATER_RELEASE = TRUE +export LAUNCHER_DEBUG_MODE = FALSE export DO_NOT_SHOW_LAUNCHER = TRUE export DISABLE_WDS_SCAN = TRUE +export IGNORE_WLFIRM_SIGNCHECK = FALSE export DISABLE_WLFIRM_LOAD = FALSE export DISABLE_SLEEP = TRUE export LOAD_APP_VIA_WRAM = FALSE +export SYSM_OUTSIDE_UI = TRUE +export SYSM_BROADON_UI = FALSE # MAKEROM SWITCH for build SystemMenu export DISABLE_DEBUG = TRUE diff --git a/docs/繝ェ繝ェ繝シ繧ケ_SDK_5_0_FC_plus2/SDK_5_0_FC_plus2_繝ゥ繝ウ繝√Ε繝シ繝ェ繝ェ繝シ繧ケ繧ソ繧ケ繧ッ.mmap b/docs/繝ェ繝ェ繝シ繧ケ_SDK_5_0_FC_plus2/SDK_5_0_FC_plus2_繝ゥ繝ウ繝√Ε繝シ繝ェ繝ェ繝シ繧ケ繧ソ繧ケ繧ッ.mmap index d30f999d..ec453cb4 100644 Binary files a/docs/繝ェ繝ェ繝シ繧ケ_SDK_5_0_FC_plus2/SDK_5_0_FC_plus2_繝ゥ繝ウ繝√Ε繝シ繝ェ繝ェ繝シ繧ケ繧ソ繧ケ繧ッ.mmap and b/docs/繝ェ繝ェ繝シ繧ケ_SDK_5_0_FC_plus2/SDK_5_0_FC_plus2_繝ゥ繝ウ繝√Ε繝シ繝ェ繝ェ繝シ繧ケ繧ソ繧ケ繧ッ.mmap differ