rename NORFIRM to FIRM

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@22 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2007-09-11 01:57:38 +00:00
parent ac4d8342d4
commit 4341524a07
17 changed files with 49 additions and 45 deletions

View File

@ -11,22 +11,22 @@
in whole or in part, without the prior written consent of Nintendo. in whole or in part, without the prior written consent of Nintendo.
$Date:: $ $Date:: $
$Rev:$ $Rev$
$Author:$ $Author$
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <firm.h> #include <firm.h>
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: OS_InitNOR Name: OS_InitNOR
Description: initialize sdk os for norfirm Description: initialize sdk os for firm
Arguments: None Arguments: None
Returns: None Returns: None
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#pragma profile off #pragma profile off
void OS_InitNOR(void) void OS_InitFIRM(void)
{ {
#ifdef SDK_ARM9 #ifdef SDK_ARM9
//---- system shared area check //---- system shared area check

View File

@ -17,7 +17,7 @@
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
FIRM_PROC = ARM7 FIRM_PROC = ARM7
FIRM_TARGET = NORFIRM FIRM_TARGET = FIRM
SUBDIRS = SUBDIRS =
@ -27,6 +27,8 @@ LINCLUDES = ../include
TARGET_BIN = twl_norfirm7_print.axf TARGET_BIN = twl_norfirm7_print.axf
CRT0_O = crt0_firm.o
SRCS = \ SRCS = \
main.c \ main.c \

View File

@ -11,8 +11,8 @@
in whole or in part, without the prior written consent of Nintendo. in whole or in part, without the prior written consent of Nintendo.
$Date:: $ $Date:: $
$Rev:$ $Rev$
$Author:$ $Author$
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <firm.h> #include <firm.h>
@ -21,7 +21,7 @@ void TwlSpMain( void )
{ {
OS_TPrintf( "\nNOR Boot time is %d msec.\n", OS_TicksToMilliSecondsBROM32(OS_GetTick())); OS_TPrintf( "\nNOR Boot time is %d msec.\n", OS_TicksToMilliSecondsBROM32(OS_GetTick()));
OS_InitNOR(); OS_InitFIRM();
OS_TPrintf( "\nARM7 starts.\n" ); OS_TPrintf( "\nARM7 starts.\n" );
OS_TPrintf( "\nARM7 ends.\n" ); OS_TPrintf( "\nARM7 ends.\n" );

View File

@ -16,7 +16,7 @@
# $Author:$ # $Author:$
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
FIRM_TARGET = NORFIRM FIRM_TARGET = FIRM
SUBDIRS = SUBDIRS =
@ -26,6 +26,8 @@ LINCLUDES = ../include
TARGET_BIN = twl_norfirm9_print.axf TARGET_BIN = twl_norfirm9_print.axf
CRT0_O = crt0_firm.o
SRCS = \ SRCS = \
main.c \ main.c \

View File

@ -11,8 +11,8 @@
in whole or in part, without the prior written consent of Nintendo. in whole or in part, without the prior written consent of Nintendo.
$Date:: $ $Date:: $
$Rev:$ $Rev$
$Author:$ $Author$
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <firm.h> #include <firm.h>
@ -21,7 +21,7 @@ void TwlMain( void )
{ {
OS_TPrintf( "\nNOR Boot time is %d msec.\n", OS_TicksToMilliSecondsBROM32(OS_GetTick())); OS_TPrintf( "\nNOR Boot time is %d msec.\n", OS_TicksToMilliSecondsBROM32(OS_GetTick()));
OS_InitNOR(); OS_InitFIRM();
OS_TPrintf( "\nARM9 starts.\n" ); OS_TPrintf( "\nARM9 starts.\n" );
OS_TPrintf( "\nARM9 ends.\n" ); OS_TPrintf( "\nARM9 ends.\n" );

View File

@ -21,20 +21,20 @@
extern "C" { extern "C" {
#endif #endif
//------------------------------------- NORFIRM //------------------------------------- FIRM
#define HW_NORFIRM HW_WRAM #define HW_FIRM HW_WRAM
#define HW_NORFIRM_END (HW_NORFIRM + HW_NORFIRM_SIZE) #define HW_FIRM_END (HW_FIRM + HW_FIRM_SIZE)
#define HW_NORFIRM_SIZE (HW_WRAM_0_SIZE + HW_WRAM_1_SIZE + HW_WRAM_A_SIZE_MAX + HW_WRAM_B_SIZE_MAX) #define HW_FIRM_SIZE (HW_WRAM_0_SIZE + HW_WRAM_1_SIZE + HW_WRAM_A_SIZE_MAX + HW_WRAM_B_SIZE_MAX)
//------------------------------------- NORFIRM_WRAM_ABC //------------------------------------- FIRM_WRAM_ABC
#define HW_NORFIRM_WRAM_A_MAP_END (HW_WRAM_AREA_END - HW_PRV_WRAM_SIZE) #define HW_FIRM_WRAM_A_MAP_END (HW_WRAM_AREA_END - HW_PRV_WRAM_SIZE)
#define HW_NORFIRM_WRAM_B_MAP_END HW_NORFIRM_WRAM_A_MAP_END #define HW_FIRM_WRAM_B_MAP_END HW_FIRM_WRAM_A_MAP_END
#define HW_NORFIRM_WRAM_C_MAP_END HW_NORFIRM_WRAM_A_MAP_END #define HW_FIRM_WRAM_C_MAP_END HW_FIRM_WRAM_A_MAP_END
//------------------------------------- HW_NORFIRM_FROM_BROM_BUF //------------------------------------- HW_FIRM_FROM_BROM_BUF
#define HW_NORFIRM_FROM_BROM_BUF (HW_NORFIRM_FROM_BROM_BUF_END - HW_NORFIRM_FROM_BROM_BUF_SIZE) #define HW_FIRM_FROM_BROM_BUF (HW_FIRM_FROM_BROM_BUF_END - HW_FIRM_FROM_BROM_BUF_SIZE)
#define HW_NORFIRM_FROM_BROM_BUF_END (HW_WRAM_AREA_END - 0x1000) // END - 4KB #define HW_FIRM_FROM_BROM_BUF_END (HW_WRAM_AREA_END - 0x1000) // END - 4KB
#define HW_NORFIRM_FROM_BROM_BUF_SIZE 0x3000 // 12KB #define HW_FIRM_FROM_BROM_BUF_SIZE 0x3000 // 12KB
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -21,20 +21,20 @@
extern "C" { extern "C" {
#endif #endif
//------------------------------------- NORFIRM //------------------------------------- FIRM
#define HW_NORFIRM HW_WRAM_EX #define HW_FIRM HW_WRAM_EX
#define HW_NORFIRM_END (HW_NORFIRM + HW_NORFIRM_SIZE) #define HW_FIRM_END (HW_FIRM + HW_FIRM_SIZE)
#define HW_NORFIRM_SIZE HW_WRAM_C_SIZE_MAX #define HW_FIRM_SIZE HW_WRAM_C_SIZE_MAX
//------------------------------------- NORFIRM_WRAM_ABC //------------------------------------- FIRM_WRAM_ABC
#define HW_NORFIRM_WRAM_A_MAP_END HW_WRAM_AREA_END #define HW_FIRM_WRAM_A_MAP_END HW_WRAM_AREA_END
#define HW_NORFIRM_WRAM_B_MAP_END HW_NORFIRM_WRAM_A_MAP_END #define HW_FIRM_WRAM_B_MAP_END HW_FIRM_WRAM_A_MAP_END
#define HW_NORFIRM_WRAM_C_MAP_END HW_NORFIRM_WRAM_A_MAP_END #define HW_FIRM_WRAM_C_MAP_END HW_FIRM_WRAM_A_MAP_END
//------------------------------------- HW_NORFIRM_FROM_BROM_BUF //------------------------------------- HW_FIRM_FROM_BROM_BUF
#define HW_NORFIRM_FROM_BROM_BUF (HW_NORFIRM_FROM_BROM_BUF_END - HW_NORFIRM_FROM_BROM_BUF_SIZE) #define HW_FIRM_FROM_BROM_BUF (HW_FIRM_FROM_BROM_BUF_END - HW_FIRM_FROM_BROM_BUF_SIZE)
#define HW_NORFIRM_FROM_BROM_BUF_END (HW_ITCM_END - 0x1000) // END - 4KB #define HW_FIRM_FROM_BROM_BUF_END (HW_ITCM_END - 0x1000) // END - 4KB
#define HW_NORFIRM_FROM_BROM_BUF_SIZE 0x3000 // 12KB #define HW_FIRM_FROM_BROM_BUF_SIZE 0x3000 // 12KB
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -55,7 +55,7 @@ void OSi_Finalize(void);
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: OSi_GetFromBromAddr Name: OSi_GetFromBromAddr
Description: data address from bootrom to norfirm Description: data address from bootrom to firm
Arguments: None Arguments: None
@ -63,7 +63,7 @@ void OSi_Finalize(void);
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static inline OSFromBromBuf* OSi_GetFromBromAddr( void ) static inline OSFromBromBuf* OSi_GetFromBromAddr( void )
{ {
return (OSFromBromBuf*)HW_NORFIRM_FROM_BROM_BUF; return (OSFromBromBuf*)HW_FIRM_FROM_BROM_BUF;
} }

View File

@ -24,15 +24,15 @@ extern "C" {
#endif #endif
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: OS_InitNOR Name: OS_InitFIRM
Description: initialize sdk os for norfirm Description: initialize sdk os for firm
Arguments: None Arguments: None
Returns: None Returns: None
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void OS_InitNOR(void); void OS_InitFIRM(void);
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -1,6 +1,6 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project: TwlFirm - tools - makelcf # Project: TwlFirm - tools - makelcf
# File: ARM7-BB-NORFIRM.lcf.template # File: ARM7-BB-FIRM.lcf.template
# #
# Copyright 2007 Nintendo. All rights reserved. # Copyright 2007 Nintendo. All rights reserved.
# #

View File

@ -1,6 +1,6 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project: TwlFirm - tools - makelcf # Project: TwlFirm - tools - makelcf
# File: ARM7-TS-NORFIRM.lcf.template # File: ARM7-TS-FIRM.lcf.template
# #
# Copyright 2007 Nintendo. All rights reserved. # Copyright 2007 Nintendo. All rights reserved.
# #

View File

@ -1,6 +1,6 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project: TwlFirm - tools - makelcf # Project: TwlFirm - tools - makelcf
# File: ARM9-BB-NORFIRM.lcf.template # File: ARM9-BB-FIRM.lcf.template
# #
# Copyright 2007 Nintendo. All rights reserved. # Copyright 2007 Nintendo. All rights reserved.
# #

View File

@ -1,6 +1,6 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project: TwlFirm - tools - makelcf # Project: TwlFirm - tools - makelcf
# File: ARM9-TS-NORFIRM.lcf.template # File: ARM9-TS-FIRM.lcf.template
# #
# Copyright 2007 Nintendo. All rights reserved. # Copyright 2007 Nintendo. All rights reserved.
# #