diff --git a/build/tests/HashCheckTemplate/ARM7/Makefile b/build/tests/HashCheckTemplate/ARM7/Makefile index 63cd8dd1..e2d8e1b7 100644 --- a/build/tests/HashCheckTemplate/ARM7/Makefile +++ b/build/tests/HashCheckTemplate/ARM7/Makefile @@ -20,7 +20,7 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -SUBMAKES = Makefile_ltd Makefile_hyb +SUBMAKES = Makefile_ltd Makefile_hyb Makefile_ltd_offset #---------------------------------------------------------------------------- diff --git a/build/tests/HashCheckTemplate/ARM7/Makefile_ltd b/build/tests/HashCheckTemplate/ARM7/Makefile_ltd index 76f7b530..e906cfb1 100644 --- a/build/tests/HashCheckTemplate/ARM7/Makefile_ltd +++ b/build/tests/HashCheckTemplate/ARM7/Makefile_ltd @@ -52,6 +52,8 @@ else MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037c0000' endif +MAKELCF_FLAGS += -DADDRESS_FLXMAIN='0x02380000' + MAKELCF_FLAGS += -DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libstubsistd_sp$(TWL_LIBSUFFIX).a)' \ -DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a' diff --git a/build/tests/HashCheckTemplate/ARM7/Makefile_ltd_offset b/build/tests/HashCheckTemplate/ARM7/Makefile_ltd_offset new file mode 100644 index 00000000..4cd7d634 --- /dev/null +++ b/build/tests/HashCheckTemplate/ARM7/Makefile_ltd_offset @@ -0,0 +1,83 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlSDK - components - racoon.TWL +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: $ +# $Rev$ +# $Author$ +#---------------------------------------------------------------------------- + +override TARGET_PLATFORM = TWL +override TWL_PROC = ARM7 +override TWL_ARCHGEN = LIMITED +TWL_NO_STD_PCHDR = True +TARGET_CODEGEN ?= ALL + +#---------------------------------------------------------------------------- + +SRCDIR += $(ROOT)/build/components/mongoose.TWL/src + +SRCS = main.c initScfg.c + +TARGET_NAME = racoon_hct_offset + +BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) + +TARGET_NEF = $(TARGET_NAME).tef +LCFILE_SPEC = racoon_hct.lsf +LCFILE_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.lcf.template +LDRES_TEMPLATE = $(ROOT)/build/components/racoon.TWL/racoon.response.template + +LLIBRARY_DIRS += ../crt/ARM7/obj/ARM7-TS.LTD/$(TWL_BUILD_DIR) +CRT0_O = crt0_hct.LTD.TWL.o + +# ƒXƒ^ƒbƒN•s‘«–hŽ~‚ΜˆΧAƒCƒ“ƒ‰ƒCƒ““WŠJ‚Ή‚Έ‚ΙƒRƒ“ƒpƒCƒ‹‚·‚ι +CCFLAGS_OPT = -O4 -inline off + +#---------------------------------------------------------------------------- +include $(TWLSDK_ROOT)/build/buildtools/commondefs + +#MACRO_FLAGS += -DSDK_ARM7COMP_LTD + +ifeq ($(TWL_PLATFORM),BB) +MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037e0000' +else +MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037c0000' +endif + +MAKELCF_FLAGS += -DADDRESS_FLXMAIN='0x02390000' + +MAKELCF_FLAGS += -DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libstubsistd_sp$(TWL_LIBSUFFIX).a)' \ + -DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a' + + +LINCLUDES = $(ROOT)/build/libraries/spi/ARM7/include +#LLIBRARIES += libwl_sp.TWL.LTD.a libsdio_hcd_twl$(TWL_LIBSUFFIX).a libsdio_busdriver$(TWL_LIBSUFFIX).a libsdio_lib$(TWL_LIBSUFFIX).a libARM7athdrv$(TWL_LIBSUFFIX).a +LLIBRARIES += libwl_sp.TWL.LTD.a +#LLIBRARIES += libwl_sp$(TWL_LIBSUFFIX).a \ +# libcdc_sp$(TWL_LIBSUFFIX).a \ +# libtpex_sp$(TWL_LIBSUFFIX).a \ +# libmicex_sp$(TWL_LIBSUFFIX).a \ +# libsdio_hcd_twl$(TWL_LIBSUFFIX).a \ +# libsdio_busdriver$(TWL_LIBSUFFIX).a \ +# libsdio_lib$(TWL_LIBSUFFIX).a \ +# librompatch_sp$(TWL_LIBSUFFIX).a \ +# libARM7athdrv$(TWL_LIBSUFFIX).a + +LDEPENDS_NEF = $(TWL_LIBS) $(LLIBRARIES) + +do-build: $(TARGETS) + +#---------------------------------------------------------------------------- +include $(TWLSDK_ROOT)/build/buildtools/modulerules + +#===== End of Makefile ===== diff --git a/build/tests/HashCheckTemplate/ARM7/racoon_hct.lsf b/build/tests/HashCheckTemplate/ARM7/racoon_hct.lsf index 7bbc3781..2928fee8 100644 --- a/build/tests/HashCheckTemplate/ARM7/racoon_hct.lsf +++ b/build/tests/HashCheckTemplate/ARM7/racoon_hct.lsf @@ -20,7 +20,7 @@ #-------- Static $(TARGET_NAME) { - Address 0x02380000 + Address $(ADDRESS_FLXMAIN) Library $(CRT0_O) \ libos_sp$(LIBSUFFIX).a \ libsyscall_sp.twl.a \ diff --git a/build/tests/TestMaker/config/romparam_forBoottest.yaml b/build/tests/TestMaker/config/romparam_forBoottest.yaml index b608654b..223806f3 100644 Binary files a/build/tests/TestMaker/config/romparam_forBoottest.yaml and b/build/tests/TestMaker/config/romparam_forBoottest.yaml differ diff --git a/build/tests/TestMaker/script/config.py b/build/tests/TestMaker/script/config.py index b034c324..1c48f359 100644 --- a/build/tests/TestMaker/script/config.py +++ b/build/tests/TestMaker/script/config.py @@ -91,9 +91,8 @@ for num in romparam.keys(): if romparam[num][optkey].has_key('ARM7LTDExpand'): codeparam.write(''.join(['MAKEROM_FLAGS += -DARM7LTD_EXPAND=', hex(romparam[num][optkey]['ARM7LTDExpand']), '\n'])) #----- γƒ’γ‚Έγƒ₯ールγ‚ͺγƒ•γ‚»γƒƒγƒˆ -# if romparam[num].has_key(optkey): -# if romparam[num][optkey].has_key('ARM9FLXOffset'): -# if romparam[num][optkey].has_key('ARM7FLXOffset'): + if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('ARM9FLXAddr'): + codeparam.write(''.join(['ADDRESS_STATIC = ', hex(romparam[num][optkey]['ARM9FLXAddr']), '\n'])) #----- ARCHGEN if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('ArchGen'): codeparam.write(''.join(['override TWL_ARCHGEN = ', romparam[num][optkey].get('ArchGen'), '\n']))