diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile index 9bcf9975..85f71219 100644 --- a/build/components/hyena.TWL/Makefile +++ b/build/components/hyena.TWL/Makefile @@ -53,7 +53,7 @@ endif #MACRO_FLAGS += -DSDK_ARM7COMP_LTD MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037a8000' \ - -DADDRESS_FLXMAIN='0x02280000' \ + -DADDRESS_FLXMAIN='0x02280200' \ -DADDRESS_BOOTCORE='0x0380f000' \ -DCRT0_O='$(CRT0_O)' diff --git a/build/components/hyena.TWL/hyena.lcf.template b/build/components/hyena.TWL/hyena.lcf.template index 24a0792c..2d148f01 100644 --- a/build/components/hyena.TWL/hyena.lcf.template +++ b/build/components/hyena.TWL/hyena.lcf.template @@ -44,7 +44,7 @@ MEMORY (RWXO): ORIGIN = , LENGTH = 0x0 > - check.LTDMAIN (RWX) : ORIGIN = 0x02280000, LENGTH = 0x74000 > ltdmain.check + check.LTDMAIN (RWX) : ORIGIN = 0x02280200, LENGTH = 0x73e00 > ltdmain.check } KEEP_SECTION diff --git a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf index 199d6f87..3dbb6dfa 100644 --- a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf +++ b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf @@ -20,7 +20,7 @@ Static $(TARGET_NAME) { - Address 0x02800000 + Address 0x02800200 Object $(OBJS_STATIC) Library $(LLIBS) $(GLIBS) $(CW_LIBS) } diff --git a/docs/メモリマップ_ランチャー.vsd b/docs/メモリマップ_ランチャー.vsd index 229786c6..0d40840f 100644 Binary files a/docs/メモリマップ_ランチャー.vsd and b/docs/メモリマップ_ランチャー.vsd differ diff --git a/include/sysmenu/hw/common/mmap.h b/include/sysmenu/hw/common/mmap.h index aee88f83..68d8d2c9 100644 --- a/include/sysmenu/hw/common/mmap.h +++ b/include/sysmenu/hw/common/mmap.h @@ -35,8 +35,10 @@ extern "C" { #else #define SYSM_OWN_ARM9_MMEM_ADDR_END 0x02e76000 #endif +#define SYSM_OWN_ARM9_MMEM_CODE_ADDR (SYSM_OWN_ARM9_MMEM_ADDR + SYSM_DMA_BUFOVER_BARRIER_SIZE) #define SYSM_OWN_ARM7_MMEM_ADDR 0x02280000 #define SYSM_OWN_ARM7_MMEM_ADDR_END 0x02380000 +#define SYSM_OWN_ARM7_MMEM_CODE_ADDR (SYSM_OWN_ARM7_MMEM_ADDR + SYSM_DMA_BUFOVER_BARRIER_SIZE) extern u32 SDK_AUTOLOAD_WRAM_START[]; #ifndef SDK_ASM #define SYSM_OWN_ARM7_WRAM_ADDR ((u32)SDK_AUTOLOAD_WRAM_START) @@ -48,6 +50,8 @@ extern u32 SDK_AUTOLOAD_WRAM_START[]; #define SYSM_BOOTCODE_ARM9_ADDR 0x027ffc00 // ARM9ŏIu[gR[hAhX #define SYSROM9_NINLOGO_ADR 0xffff0020 // ARM9VXeROM̔CVSi[AhX +#define SYSM_DMA_BUFOVER_BARRIER_SIZE 0x0200 + // J[hAvi[obt@ #define SYSM_CARD_ROM_HEADER_SIZE 0x1000