From a61e9be148c2083f5f3f113ebc4357333d023425 Mon Sep 17 00:00:00 2001 From: yutaka Date: Fri, 16 Nov 2007 05:24:42 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E6=99=82?= =?UTF-8?q?=E3=81=AE=E3=82=AF=E3=83=AA=E3=82=A2=E7=AF=84=E5=9B=B2=E3=81=AE?= =?UTF-8?q?=E9=96=8B=E5=A7=8B=E3=82=920x2000400=E3=81=8B=E3=82=89=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= 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@197 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/nandfirm/menu-launcher/ARM9/main.c | 3 +-- build/nandfirm/sdmc-launcher/ARM9/main.c | 3 +-- include/firm/hw/ARM7/mmap_firm.h | 8 ++++---- include/firm/hw/ARM9/mmap_firm.h | 13 +++++++++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c index dcb7580a..645bc2c7 100644 --- a/build/nandfirm/menu-launcher/ARM9/main.c +++ b/build/nandfirm/menu-launcher/ARM9/main.c @@ -86,7 +86,6 @@ static void PreInit(void) OS_Init後にいろいろ処理したい！ メインメモリの初期化 ***************************************************************/ -extern u32 SDK_SECTION_ARENA_DTCM_START; static void PostInit(void) { /* @@ -95,7 +94,7 @@ static void PostInit(void) // ARM9領域を全クリア if ( OS_GetResetParameter() ) { - MI_CpuClearFast( (void*)HW_DELIVER_ARG_BUF_END, HW_MAIN_MEM_MAIN_END-HW_DELIVER_ARG_BUF_END ); + MI_CpuClearFast( (void*)HW_FIRM_RESET_BUF_END, HW_MAIN_MEM_MAIN_END-HW_FIRM_RESET_BUF_END ); } else { diff --git a/build/nandfirm/sdmc-launcher/ARM9/main.c b/build/nandfirm/sdmc-launcher/ARM9/main.c index 98924a71..1b477d6e 100644 --- a/build/nandfirm/sdmc-launcher/ARM9/main.c +++ b/build/nandfirm/sdmc-launcher/ARM9/main.c @@ -73,7 +73,6 @@ static void PreInit(void) OS_Init後にいろいろ処理したい！ メインメモリの初期化 ***************************************************************/ -extern u32 SDK_SECTION_ARENA_DTCM_START; static void PostInit(void) { /* @@ -82,7 +81,7 @@ static void PostInit(void) // ARM9領域を全クリア if ( OS_GetResetParameter() ) { - MI_CpuClearFast( (void*)HW_DELIVER_ARG_BUF_END, HW_MAIN_MEM_MAIN_END-HW_DELIVER_ARG_BUF_END ); + MI_CpuClearFast( (void*)HW_FIRM_RESET_BUF_END, HW_MAIN_MEM_MAIN_END-HW_FIRM_RESET_BUF_END ); } else { diff --git a/include/firm/hw/ARM7/mmap_firm.h b/include/firm/hw/ARM7/mmap_firm.h index dbd15349..4eb5b7a7 100644 --- a/include/firm/hw/ARM7/mmap_firm.h +++ b/include/firm/hw/ARM7/mmap_firm.h @@ -36,22 +36,22 @@ extern "C" { #define HW_FIRM_IRQ_STACK_END HW_FIRM_SVC_STACK #define HW_FIRM_IRQ_STACK_SIZE SDK_IRQ_STACKSIZE -//------------------------------------- HW_FIRM_FROM_BROM_BUF +//------------------------------------- FIRM_FROM_BROM_BUF #define HW_FIRM_FROM_BROM_BUF (HW_FIRM_FROM_BROM_BUF_END - HW_FIRM_FROM_BROM_BUF_SIZE) #define HW_FIRM_FROM_BROM_BUF_END (HW_WRAM_AREA_END - 0x1000) // END - 4KB #define HW_FIRM_FROM_BROM_BUF_SIZE 0x3000 // 12KB -//------------------------------------- HW_FIRM_FROM_FIRM_BUF +//------------------------------------- FIRM_FROM_FIRM_BUF #define HW_FIRM_FROM_FIRM_BUF (HW_FIRM_FROM_FIRM_BUF_END - HW_FIRM_FROM_FIRM_BUF_SIZE) #define HW_FIRM_FROM_FIRM_BUF_END (HW_WRAM_AREA_END - 0x1000) // END - 4KB #define HW_FIRM_FROM_FIRM_BUF_SIZE 0x2C00 // 11KB -//------------------------------------- HW_FIRM_APP_BUF +//------------------------------------- FIRM_APP_BUF #define HW_FIRM_APP_BUF (HW_MAIN_MEM_HI_EX_END - HW_FIRM_APP_BUF_SIZE) #define HW_FIRM_APP_BUF_END (HW_FIRM_APP_BUF + HW_FIRM_APP_BUF_SIZE) #define HW_FIRM_APP_BUF_SIZE 0x00800000 // 8MB -//------------------------------------- HW_FIRM_BOOT_CORE +//------------------------------------- FIRM_BOOT_CORE #define HW_FIRM_BOOT_CORE HW_FIRM_FROM_BROM_BUF_END #define HW_FIRM_BOOT_CORE_END (HW_FIRM_BOOT_CORE + HW_FIRM_BOOT_CORE_SIZE) #define HW_FIRM_BOOT_CORE_SIZE 0x200 // 512B diff --git a/include/firm/hw/ARM9/mmap_firm.h b/include/firm/hw/ARM9/mmap_firm.h index 49b22621..468a9a8f 100644 --- a/include/firm/hw/ARM9/mmap_firm.h +++ b/include/firm/hw/ARM9/mmap_firm.h @@ -26,22 +26,27 @@ extern "C" { #define HW_FIRM_END (HW_FIRM + HW_FIRM_SIZE) #define HW_FIRM_SIZE HW_WRAM_C_SIZE_MAX -//------------------------------------- HW_FIRM_FROM_BROM_BUF +//------------------------------------- FIRM_RESET_BUF +#define HW_FIRM_RESET_BUF HW_MAIN_MEM +#define HW_FIRM_RESET_BUF_END (HW_FIRM_RESET_BUF + HW_FIRM_RESET_BUF_SIZE) +#define HW_FIRM_RESET_BUF_SIZE 0x400 // 12KB + +//------------------------------------- FIRM_FROM_BROM_BUF #define HW_FIRM_FROM_BROM_BUF (HW_FIRM_FROM_BROM_BUF_END - HW_FIRM_FROM_BROM_BUF_SIZE) #define HW_FIRM_FROM_BROM_BUF_END (HW_ITCM_END - 0x1000) // END - 4KB #define HW_FIRM_FROM_BROM_BUF_SIZE 0x3000 // 12KB -//------------------------------------- HW_FIRM_FROM_FIRM_BUF +//------------------------------------- FIRM_FROM_FIRM_BUF #define HW_FIRM_FROM_FIRM_BUF (HW_FIRM_FROM_FIRM_BUF_END - HW_FIRM_FROM_FIRM_BUF_SIZE) #define HW_FIRM_FROM_FIRM_BUF_END (HW_ITCM_END - 0x1000) // END - 4KB #define HW_FIRM_FROM_FIRM_BUF_SIZE 0x2C00 // 11KB -//------------------------------------- HW_FIRM_APP_BUF +//------------------------------------- FIRM_APP_BUF #define HW_FIRM_APP_BUF (HW_MAIN_MEM_HI_EX_END - HW_FIRM_APP_BUF_SIZE) #define HW_FIRM_APP_BUF_END (HW_FIRM_APP_BUF + HW_FIRM_APP_BUF_SIZE) #define HW_FIRM_APP_BUF_SIZE 0x00800000 // 8MB -//------------------------------------- HW_FIRM_BOOT_CORE +//------------------------------------- FIRM_BOOT_CORE #define HW_FIRM_BOOT_CORE HW_FIRM_FROM_BROM_BUF_END #define HW_FIRM_BOOT_CORE_END (HW_FIRM_BOOT_CORE + HW_FIRM_BOOT_CORE_SIZE) #define HW_FIRM_BOOT_CORE_SIZE 0x200 // 512B