diff --git a/RomHeader/0D0A/libsyscall.a b/RomHeader/0D0A/libsyscall.a new file mode 100644 index 00000000..237b50dd Binary files /dev/null and b/RomHeader/0D0A/libsyscall.a differ diff --git a/RomHeader/0D0A/libsyscall_c.bin b/RomHeader/0D0A/libsyscall_c.bin new file mode 100644 index 00000000..5a8cf9d8 Binary files /dev/null and b/RomHeader/0D0A/libsyscall_c.bin differ diff --git a/RomHeader/0D0A/rom_header_0d0a.template.sbin b/RomHeader/0D0A/rom_header_0d0a.template.sbin new file mode 100644 index 00000000..c91573c9 Binary files /dev/null and b/RomHeader/0D0A/rom_header_0d0a.template.sbin differ diff --git a/RomHeader/0D1A/libsyscall.a b/RomHeader/0D1A/libsyscall.a new file mode 100644 index 00000000..c41f9f17 Binary files /dev/null and b/RomHeader/0D1A/libsyscall.a differ diff --git a/RomHeader/0D1A/libsyscall_c.bin b/RomHeader/0D1A/libsyscall_c.bin new file mode 100644 index 00000000..b1b34582 Binary files /dev/null and b/RomHeader/0D1A/libsyscall_c.bin differ diff --git a/RomHeader/0D1A/rom_header_0d1a.template.sbin b/RomHeader/0D1A/rom_header_0d1a.template.sbin new file mode 100644 index 00000000..0f3122f6 Binary files /dev/null and b/RomHeader/0D1A/rom_header_0d1a.template.sbin differ diff --git a/RomHeader/0D2A/libsyscall.a b/RomHeader/0D2A/libsyscall.a new file mode 100644 index 00000000..9759e4f7 Binary files /dev/null and b/RomHeader/0D2A/libsyscall.a differ diff --git a/RomHeader/0D2A/libsyscall_c.bin b/RomHeader/0D2A/libsyscall_c.bin new file mode 100644 index 00000000..b69e9655 Binary files /dev/null and b/RomHeader/0D2A/libsyscall_c.bin differ diff --git a/RomHeader/0D2A/rom_header_0d2a.template.sbin b/RomHeader/0D2A/rom_header_0d2a.template.sbin new file mode 100644 index 00000000..4cc90a9f Binary files /dev/null and b/RomHeader/0D2A/rom_header_0d2a.template.sbin differ diff --git a/RomHeader/0D3A/libsyscall.a b/RomHeader/0D3A/libsyscall.a new file mode 100644 index 00000000..4fee38a0 Binary files /dev/null and b/RomHeader/0D3A/libsyscall.a differ diff --git a/RomHeader/0D3A/libsyscall_c.bin b/RomHeader/0D3A/libsyscall_c.bin new file mode 100644 index 00000000..72ac8b05 Binary files /dev/null and b/RomHeader/0D3A/libsyscall_c.bin differ diff --git a/RomHeader/0D3A/rom_header_0d3a.template.sbin b/RomHeader/0D3A/rom_header_0d3a.template.sbin new file mode 100644 index 00000000..5776c17b Binary files /dev/null and b/RomHeader/0D3A/rom_header_0d3a.template.sbin differ diff --git a/RomHeader/0D4A/libsyscall.a b/RomHeader/0D4A/libsyscall.a new file mode 100644 index 00000000..1b9652db Binary files /dev/null and b/RomHeader/0D4A/libsyscall.a differ diff --git a/RomHeader/0D4A/libsyscall_c.bin b/RomHeader/0D4A/libsyscall_c.bin new file mode 100644 index 00000000..c2f1766b Binary files /dev/null and b/RomHeader/0D4A/libsyscall_c.bin differ diff --git a/RomHeader/0D4A/rom_header_0d4a.template.sbin b/RomHeader/0D4A/rom_header_0d4a.template.sbin new file mode 100644 index 00000000..7c9528b3 Binary files /dev/null and b/RomHeader/0D4A/rom_header_0d4a.template.sbin differ diff --git a/build/tests/TestMaker/Makefile b/build/tests/TestMaker/Makefile index f8164b42..d08e4e92 100644 --- a/build/tests/TestMaker/Makefile +++ b/build/tests/TestMaker/Makefile @@ -193,6 +193,11 @@ INSTALL_DIR = $(BASEDIR)/test_roms USE_IPL_RED_LIB = TRUE MAKEROM_ROMROOT = ../../../systemMenu_RED/ MAKEROM_ROMFILES = ./data/NTR_IPL_font_m.NFTR +# boottestの時だけARM7コンポーネントの指定 +# このあたりの指定が苦肉すぎるので妙案募集中 +override DEFAULT_COMP_ARM7 = racoon_hct +override DEFAULT_MAKEROM_ARM7_BASE = $(BASEDIR)/ARM7/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) +override DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) endif BANNER = ./banner.bnr @@ -218,14 +223,6 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib endif -# boottestの時だけARM7コンポーネントの指定 -# このあたりの指定が苦肉すぎるので妙案募集中 -ifeq ($(TEST_TYPE),BOOT) -DEFAULT_COMP_ARM7 = racoon_hct -DEFAULT_MAKEROM_ARM7_BASE = $(BASEDIR)/ARM7/bin/$(TWL_BUILDTYPE_ARM7)/$(DEFAULT_COMP_ARM7) -DEFAULT_MAKEROM_ARM7 = $(DEFAULT_MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) -endif - #---------------------------------------------------------------------------- do-build: $(TARGETS) diff --git a/build/tests/TestMaker/config/romparam_forBoottest.yaml b/build/tests/TestMaker/config/romparam_forBoottest.yaml index df809c54..ac87095d 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/config/romparam_forFATFSPermissiontest.yaml b/build/tests/TestMaker/config/romparam_forFATFSPermissiontest.yaml index ab6b8888..980299c9 100644 Binary files a/build/tests/TestMaker/config/romparam_forFATFSPermissiontest.yaml and b/build/tests/TestMaker/config/romparam_forFATFSPermissiontest.yaml differ diff --git a/build/tests/TestMaker/script/config.py b/build/tests/TestMaker/script/config.py index 90a292d1..49c60e4d 100644 --- a/build/tests/TestMaker/script/config.py +++ b/build/tests/TestMaker/script/config.py @@ -51,15 +51,20 @@ for num in romparam.keys(): else: romspectemplate = '' #----- MAKETAD_OPTION, ROM_SPEC_TEMPLATE 縺ｮ謖螳 + debugmakerom = '' + if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('SysmenuDebug') and romparam[num][optkey]['SysmenuDebug']: + debugmakerom = '.DEBUG' if romparam[num][rsfkey].get('AppType') == 'SYSTEM': #----- MAKEROM 縺ｮ謖螳 if romparam[num][rsfkey]['Secure']: - codeparam.write('override MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe\n') + codeparam.write(''.join(['override MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure', debugmakerom, '.exe\n'])) else: - codeparam.write('override MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.sys.exe\n') + codeparam.write(''.join(['override MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.sys', debugmakerom, '.exe\n'])) codeparam.write('MAKETAD_OPTION += -s\n') romspectemplate = '$(ROOT)/include/twl/specfiles/ROM-TS_sys.rsf' else: + if debugmakerom == '.DEBUG': + codeparam.write('override MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.DEBUG.exe\n') # 證ｫ螳壼ｯｾ蜃ｦ include/twl/specfiles 莉･荳九ｒ縺阪■繧薙→菴ｿ縺繧医≧縺ｫ螟画峩縺吶ｋ蠢隕√′縺ゅｋ if testtype == 'PARENTAL': romspectemplate = '../config/ROM-TS_nand_forPARENTAL.rsf' @@ -70,10 +75,11 @@ for num in romparam.keys(): codeparam.write(''.join(['ROM_SPEC_TEMPLATE = ',romspectemplate,'\n'])) #----- ROM_HEADER_TEMPLATE縺翫ｈ縺ｳLIBSYSCALL縺ｮ謖螳 - if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('UseFinalHeader'): + if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('UseFinalHeader') and romparam[num][optkey]['UseFinalHeader']: codeparam.write(''.join(['ROM_HEADER_TEMPLATE = $(SYSMENU_ROM_HEADER_DIR)/',gamecode,'/rom_header_$(call toLower,',gamecode,').template.sbin\n'])) codeparam.write(''.join(['LIBSYSCALL = $(SYSMENU_ROM_HEADER_DIR)/',gamecode,'/libsyscall.a\n'])) - + if debugmakerom == '.DEBUG': + codeparam.write('MAKEROM_FLAGS += -DSYSCALL_C=\'$(call empath,$(LIBSYSCALL:.a=_c.bin))\'\n') #----- ROM_SPEC_OPTIONS key 縺ｮ謚ｽ蜃ｺ if romparam[num][rsfkey].get('AppType') == 'SYSTEM': keys = [key for key in romparam[num][rsfkey].keys() if key != 'TitleType' and key != 'eTicket' ] @@ -110,7 +116,7 @@ for num in romparam.keys(): if romparam[num].has_key(ratingkey): rsf_opt.append('%s=%s '%(romparam[num][ratingkey]['Ogn'],str(romparam[num][ratingkey]['Age']))) #----- RomHeaderTemplate縺ｮ謖螳 - if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('UseFinalHeader'): + if romparam[num].has_key(optkey) and romparam[num][optkey].has_key('UseFinalHeader') and romparam[num][optkey]['UseFinalHeader']: rsf_opt.append('RomHeaderTemplate=$(call empath,$(ROM_HEADER_TEMPLATE)) ') #----- ROM_SPEC_OPTIONS 縺ｮ謖螳 rsf_opt_str = ''.join(rsf_opt)