From 2d97ecb88add585681909c977a601bb3aadc076f Mon Sep 17 00:00:00 2001 From: nakasima Date: Wed, 2 May 2007 05:27:45 +0000 Subject: [PATCH] small fix. git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@58 4ee2a332-4b2b-5046-8439-1ba90f034370 --- build/buildsetup/Makefile | 2 +- build/buildtools/commondefs | 5 +++-- include/nitro/hw/ARM7/mmap_global.h | 8 ++++++++ include/nitro/hw/ARM9/mmap_global.h | 7 +++++++ include/twl/mi/wram_abc.h | 4 ---- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build/buildsetup/Makefile b/build/buildsetup/Makefile index 928b22d..c9a7109 100644 --- a/build/buildsetup/Makefile +++ b/build/buildsetup/Makefile @@ -19,7 +19,7 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- ifdef TWL_PRIVATE -SUBDIRS += versions +SUBDIRS += # versions endif SUBDIRS += ioreg ioreg_sp # fx diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index adb84b2..12e4e69 100644 --- a/build/buildtools/commondefs +++ b/build/buildtools/commondefs @@ -199,8 +199,8 @@ include $(NITROSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -ifeq ($(NITRO_PROVATE),TRUE) -TWL_PROVATE := TRUE +ifeq ($(NITRO_PRIVATE),TRUE) +TWL_PRIVATE := TRUE endif ifeq ($(NITRO_WITH_ARM7),TRUE) @@ -239,6 +239,7 @@ TWL_INSTALL_ADDINS := $(TWL_INSTALL_ROOT)/add-ins # Compiler flags # MACRO_FLAGS += -DSDK_DEBUGGER_$(TWL_DEBUGGER) +MACRO_FLAGS += -DTWL_PLATFORM_$(TWL_PLATFORM) #---------------------------------------------------------------------------- diff --git a/include/nitro/hw/ARM7/mmap_global.h b/include/nitro/hw/ARM7/mmap_global.h index 8b36df3..1b7ab85 100644 --- a/include/nitro/hw/ARM7/mmap_global.h +++ b/include/nitro/hw/ARM7/mmap_global.h @@ -106,6 +106,14 @@ extern "C" { #define HW_WRAM_1_END 0x03800000 #define HW_WRAM_1_SIZE (HW_WRAM_1_END-HW_WRAM_1) +#ifdef TWL_PLATFORM_BB +#define HW_WRAM_A_SIZE_MAX 0x00020000 +#else // TWL_PLATFORM_BB +#define HW_WRAM_A_SIZE_MAX 0x00040000 +#endif // TWL_PLATFORM_BB +#define HW_WRAM_B_SIZE_MAX HW_WRAM_A_SIZE_MAX +#define HW_WRAM_C_SIZE_MAX HW_WRAM_B_SIZE_MAX + //----------------------------- PRV-WRAMs #define HW_PRV_WRAM 0x03800000 // TEG : ARM7 WRAM == 32KB diff --git a/include/nitro/hw/ARM9/mmap_global.h b/include/nitro/hw/ARM9/mmap_global.h index e2b62ec..5638626 100644 --- a/include/nitro/hw/ARM9/mmap_global.h +++ b/include/nitro/hw/ARM9/mmap_global.h @@ -115,6 +115,13 @@ extern u32 SDK_AUTOLOAD_DTCM_START[]; #define HW_WRAM_1 0x037fc000 #define HW_WRAM_1_END 0x03800000 #define HW_WRAM_1_SIZE (HW_WRAM_1_END-HW_WRAM_1) +#ifdef TWL_PLATFORM_BB +#define HW_WRAM_A_SIZE_MAX 0x00020000 +#else // TWL_PLATFORM_BB +#define HW_WRAM_A_SIZE_MAX 0x00040000 +#endif // TWL_PLATFORM_BB +#define HW_WRAM_B_SIZE_MAX HW_WRAM_A_SIZE_MAX +#define HW_WRAM_C_SIZE_MAX HW_WRAM_B_SIZE_MAX //----------------------------- IOs #define HW_IOREG 0x04000000 #define HW_IOREG_END 0x05000000 diff --git a/include/twl/mi/wram_abc.h b/include/twl/mi/wram_abc.h index fc00bf3..52f5724 100644 --- a/include/twl/mi/wram_abc.h +++ b/include/twl/mi/wram_abc.h @@ -147,10 +147,6 @@ MIImageWramC; #define MI_WRAM_C_BLOCK_NUM 8 #endif // BROM_PLATFORM_TS -#define MI_WRAM_A_BLOCK_SIZE_MAX (MI_WRAM_A_BLOCK_SIZE * MI_WRAM_A_BLOCK_NUM) -#define MI_WRAM_B_BLOCK_SIZE_MAX (MI_WRAM_B_BLOCK_SIZE * MI_WRAM_B_BLOCK_NUM) -#define MI_WRAM_C_BLOCK_SIZE_MAX (MI_WRAM_C_BLOCK_SIZE * MI_WRAM_C_BLOCK_NUM) - #define MI_WRAM_MAP_NULL (HW_WRAM_AREA + HW_WRAM_AREA_SIZE/4)