From d4b7678f6dec1acbe1e7d2036eba119b319a4995 Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Tue, 20 Nov 2007 06:12:32 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=96=E3=83=BC=E3=83=88=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=81=AE=E6=B6=88?= =?UTF-8?q?=E3=81=88=E3=82=8B=E8=AC=8E=E7=8F=BE=E8=B1=A1=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E8=AA=BF=E6=9F=BB=E7=94=A8=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= 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@221 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../libraries_sysmenu/boot/ARM7/src/bootAPI.c | 19 ++++++++++++++++--- .../libraries_sysmenu/boot/ARM9/src/bootAPI.c | 7 ++----- .../systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf | 7 ------- build/systemMenu_RED/Launcher/ARM9/Makefile | 5 ++--- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c index 5c2f4cb3..735e976f 100644 --- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c @@ -40,14 +40,27 @@ void BOOT_Init( void ) { reg_PXI_MAINPINTF = 0x0000; } - - + BOOL BOOT_WaitStart( void ) { if( (reg_PXI_MAINPINTF & 0x000f ) == 0x000f ) { // メモリクリアリストの設定 static u32 clr_list[] = { + //SYSM_OWN_ARM7_MMEM_ADDR, SYSM_OWN_ARM7_MMEM_ADDR_END - SYSM_OWN_ARM7_MMEM_ADDR, + //SYSM_OWN_ARM9_MMEM_ADDR, SYSM_OWN_ARM9_MMEM_ADDR_END - SYSM_OWN_ARM9_MMEM_ADDR, + //SYSM_OWN_ARM7_WRAM_ADDR, SYSM_OWN_ARM7_WRAM_ADDR_END - SYSM_OWN_ARM7_WRAM_ADDR, + +// HW_PRV_WRAM_END - 0x600, 0x600, +#ifdef ISDBG_MB_CHILD_ + //HW_PRV_WRAM_END - 0x600, (HW_PRV_WRAM_END - HW_PRV_WRAM_SYSRV_SIZE) - (HW_PRV_WRAM_END - 0x600), + //HW_PRV_WRAM_END - 0x600 + 0x20, HW_PRV_WRAM_END - (HW_PRV_WRAM_END - 0x600 + 0x20), +#endif + //SYSM_BOOTCODE_ARM7_ADDR, ClearMemory - SYSM_BOOTCODE_ARM7_ADDR, +// 0x02fff000, 0x800, +// 0xda0, 0x60, +// 0xf80, 0x80, + NULL }; @@ -61,7 +74,7 @@ BOOL BOOT_WaitStart( void ) InsertWLPatch(); } */ - // BOOTi_ClearREG_RAM(); // ARM7側のメモリ＆レジスタクリア。 + BOOTi_ClearREG_RAM(); // ARM7側のメモリ＆レジスタクリア。 reg_MI_MBK9 = 0; // 全WRAMのロック解除 reg_PXI_MAINPINTF = MAINP_SEND_IF | 0x0100; // ARM9に対してブートするようIRQで要求＋ARM7のステートを１にする。 // BOOT_Core(); // never return diff --git a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c index 869b5a1d..11a8c185 100644 --- a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c @@ -63,10 +63,7 @@ void BOOT_Ready( void ) static u32 clr_list[] = { HW_ITCM, HW_ITCM_SIZE, - HW_OAM, HW_OAM_SIZE, - HW_PLTT, HW_PLTT_SIZE, - HW_DB_OAM, HW_DB_OAM_SIZE, - HW_DB_PLTT, HW_DB_PLTT_SIZE, + HW_DTCM, HW_DTCM_SIZE, NULL }; @@ -80,7 +77,7 @@ void BOOT_Ready( void ) } // FinalizeCardPulledOut(); // カード抜け検出終了処理 - // BOOTi_ClearREG_RAM(); // レジスタ＆RAMクリア + BOOTi_ClearREG_RAM(); // レジスタ＆RAMクリア (void)GX_VBlankIntr( FALSE ); (void)OS_SetIrqFunction( OS_IE_SUBP, ie_subphandler ); OS_EnableInterrupts(); diff --git a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf index f136d8ee..199d6f87 100644 --- a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf +++ b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf @@ -44,13 +44,6 @@ 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 77837209..556b1203 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -50,7 +50,8 @@ LINCLUDES = $(MISC_DIR)/include \ $(SRCDIR)/$(LOGO_DIR) LLIBRARIES += libnam$(TWL_LIBSUFFIX).a \ - libese$(TWL_LIBSUFFIX).a + libese$(TWL_LIBSUFFIX).a \ + libboot$(TWL_LIBSUFFIX).a ADDRESS_DTCM = 0x0e000000 @@ -62,8 +63,6 @@ MAKEROM_FLAGS += -F -DTITLEID_LO='$(TITLEID_LO)' include $(TWLIPL_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot -MAKELCF_FLAGS += -DADDRESS_BOOTCORE='0x02e7fc00' - LDIRT_CLEAN = $(TARGET_WAD) INSTALL_TARGETS = $(TARGET_WAD) INSTALL_DIR = $(SDK_NMENU_DATADIR)