diff --git a/build/libraries_sysmenu/boot/ARM7/src/boot.c b/build/libraries_sysmenu/boot/ARM7/src/boot.c index 380a2e11..f84a4e96 100644 --- a/build/libraries_sysmenu/boot/ARM7/src/boot.c +++ b/build/libraries_sysmenu/boot/ARM7/src/boot.c @@ -53,14 +53,14 @@ static void _ISDbgLib_OnLoadChildBinary( void ); static asm void ClearMemory( void ) { mov r11, lr -#if 0 +#if 1 ldr r0, = 0x02280000 // SYSMENU-ARM7 MMEMのクリア ldr r1, = 0x02380000 bl CpuClear32Byte -// ldr r0, = 0x02800000 // SYSMENU-ARM9 MMEMのクリア -// ldr r1, = 0x02e80000 -// bl CpuClear32Byte + ldr r0, = 0x02800000 // SYSMENU-ARM9 MMEMのクリア + ldr r1, = 0x02e7fc00 + bl CpuClear32Byte ldr r0, = HW_WRAM_A_LTD // ARM7-WRAMのクリア( LTDのマッピング ) ldr r1, = BOOTCORE_ARM7_ADDR diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index d9f9896d..9453c61a 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -100,6 +100,8 @@ void SYSM_Init( void *(*pAlloc)(u32), void (*pFree)(void*) ) ncdp = GetTSD(); #endif /* __SYSM_DEBUG */ + OS_SetMainArenaHi( (void *)0x02e7fc00 ); + TP_Init(); RTC_Init(); diff --git a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf index 199d6f87..f136d8ee 100644 --- a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf +++ b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf @@ -44,6 +44,13 @@ Autoload DTCM Object $(OBJS_AUTOLOAD) (.sbss) } +Autoload BOOT_CORE +{ + Address $(ADDRESS_BOOTCORE) + + Library libboot.TWL$(CODEGEN).a +} + Ltdautoload LTDMAIN { # NITRO/TWL 共有のオーバーレイが在る場合は、さらにその後ろに配置する必要があります。 diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index bfb4f372..17e305ae 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -43,8 +43,7 @@ LINCLUDES = $(SRCDIR)/$(LOGO_DIR) #LDEPENDS_NEF = LLIBRARIES += libnam$(TWL_LIBSUFFIX).a \ - libese$(TWL_LIBSUFFIX).a \ - libboot$(TWL_LIBSUFFIX).a + libese$(TWL_LIBSUFFIX).a ADDRESS_DTCM = 0x0e000000 @@ -55,6 +54,8 @@ MAKEROM_FLAGS += -F include $(TWLIPL_ROOT)/build/buildtools/commondefs +MAKELCF_FLAGS += -DADDRESS_BOOTCORE='0x02e7fc00' + #---------------------------------------------------------------------------- do-build : $(FONT_OBJS) $(TARGETS)