SYSM_OWN_ARM7_WRAM_ADDR は SDK_AUTOLOAD_WRAM_START を参照するように変更。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@354 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
nakasima 2007-12-12 11:41:31 +00:00
parent 19ba34e999
commit 09bef4a051
4 changed files with 16 additions and 7 deletions

View File

@ -15,6 +15,7 @@
$Author$
*---------------------------------------------------------------------------*/
#define SDK_ASM
#include <twl.h>
#include <sysmenu.h>
//#include "loader.h"

View File

@ -27,13 +27,13 @@
#define reg_MI_MC_SWP (*(REGType8v *) ( REG_MC1_ADDR + 1 ) )
#ifdef ISDBG_MB_CHILD_
#define PRE_CLEAR_NUM_MAX 14
#define PRE_CLEAR_NUM_MAX (6*2)
#else
#define PRE_CLEAR_NUM_MAX 10
#define PRE_CLEAR_NUM_MAX (4*2)
#endif
#define COPY_NUM_MAX 12
#define POST_CLEAR_NUM_MAX 8
#define COPY_NUM_MAX (4*3)
#define POST_CLEAR_NUM_MAX (4*2)
// extern data-------------------------------------------------------
@ -81,10 +81,9 @@ BOOL BOOT_WaitStart( void )
static u32 mem_list[PRE_CLEAR_NUM_MAX + 1 + COPY_NUM_MAX + 2 + POST_CLEAR_NUM_MAX + 1] =
{
// pre clear
SYSM_OWN_ARM7_WRAM_ADDR, NULL, // SYSM_OWN_ARM7_WRAM_ADDRSDK_AUTOLOAD_WRAM_STARTはリンカから与えられる
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,
SYSM_OWN_ARM7_WRAM_ADDR, SYSM_OWN_ARM7_WRAM_ADDR_END - SYSM_OWN_ARM7_WRAM_ADDR,
#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),
@ -98,6 +97,7 @@ BOOL BOOT_WaitStart( void )
// post clear
NULL,
};
mem_list[1] = SYSM_OWN_ARM7_WRAM_ADDR_END - SYSM_OWN_ARM7_WRAM_ADDR;
// copy forwardƒŠƒXƒg<C692>Ýè
for( l=0; l<RELOCATE_INFO_NUM ; l++ )

View File

@ -15,6 +15,7 @@
$Author$
*---------------------------------------------------------------------------*/
#define SDK_ASM
#include <twl.h>
#include <sysmenu.h>
//#include <nitro/mb.h>

View File

@ -18,7 +18,9 @@
#ifndef _SYSMENU_MMAP_H_
#define _SYSMENU_MMAP_H_
#ifndef SDK_ASM
#include <twl.h>
#endif
#ifdef __cplusplus
extern "C" {
@ -35,7 +37,12 @@ extern "C" {
#endif
#define SYSM_OWN_ARM7_MMEM_ADDR 0x02280000
#define SYSM_OWN_ARM7_MMEM_ADDR_END 0x02380000
#define SYSM_OWN_ARM7_WRAM_ADDR 0x037c0000
extern u32 SDK_AUTOLOAD_WRAM_START[];
#ifndef SDK_ASM
#define SYSM_OWN_ARM7_WRAM_ADDR ((u32)SDK_AUTOLOAD_WRAM_START)
#else
#define SYSM_OWN_ARM7_WRAM_ADDR SDK_AUTOLOAD_WRAM_START
#endif
#define SYSM_OWN_ARM7_WRAM_ADDR_END 0x0380f000
#define SYSM_BOOTCODE_ARM9_ADDR 0x027ffc00 // ARM9最終ブートコードアドレス