・TwlIPLのTHUMBビルドに対応。（make TWL_CODEGEN=THUMBとした時、ARM9はTHUMB、ARM7はARMビルド

になる。・TwlWirelessライブラリのSYSMENUビルドを無効にする。（未使用のため）・makerom.TWL.launcherにSDK rev.7871の変更を反映。 git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2150 b08762b0-b915-fc4b-9d8c-17b2551a87ff
2025-10-31 06:01:12 -04:00 · 2008-08-13 13:52:56 +00:00 · 2008-08-13 13:52:56 +00:00 · 4244072355
commit 4244072355
parent ff8cf7b294
37 changed files with 58 additions and 45 deletions
--- a/build/buildtools/commondefs.sysmenu
+++ b/build/buildtools/commondefs.sysmenu
@ -106,6 +106,11 @@ ifeq ($(SYSM_BUILD_FOR_DEBUGGER),TRUE)
 MACRO_FLAGS		+=	-DSYSM_BUILD_FOR_DEBUGGER
 endif

+#----------------------------------------------------------------------------
+# ARM7コンポーネントにARMビルドを使用する
+
+TWL_BUILDTYPE_ARM7	:= $(subst $(CODEGEN_ARCH),,$(TWL_BUILDTYPE_ARM7))
+
 #----------------------------------------------------------------------------
 endif	# TWL_SYSMENU_COMMONDEFS_
 #----- End of commondefs -----
--- a/build/components/hyena.TWL/Makefile
+++ b/build/components/hyena.TWL/Makefile
@ -24,7 +24,7 @@ override TARGET_PLATFORM	=	TWL
 override TWL_PROC			=	ARM7
 override TWL_ARCHGEN		=	LIMITED
 TWL_NO_STD_PCHDR			=	True
-TWL_CODEGEN					?=	ARM
+override TWL_CODEGEN 		=	ARM

 FIRM_LIBSUFFIX	=	.firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH)

--- a/build/components/jackal.TWL/Makefile
+++ b/build/components/jackal.TWL/Makefile
@ -25,7 +25,7 @@ override TWL_PROC			=	ARM7
 override TWL_ARCHGEN		=	LIMITED
 override TWL_PLATFORM		=	TS
 TWL_NO_STD_PCHDR			=	True
-TWL_CODEGEN					?=	ARM
+override TWL_CODEGEN 		=	ARM

 FIRM_LIBSUFFIX	=	.firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH)

--- a/build/debugsoft/Jpeg/SdToPhoto/Makefile
+++ b/build/debugsoft/Jpeg/SdToPhoto/Makefile
@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	= TWL
-override TARGET_CODEGEN		= ARM
+override TWL_CODEGEN		= ARM
 override TWL_ARCHGEN		= LIMITED


--- a/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile
+++ b/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile
@ -18,7 +18,7 @@


 override TARGET_PLATFORM	= TWL
-override TARGET_CODEGEN		= ARM
+override TWL_CODEGEN		= ARM
 override TWL_ARCHGEN		= LIMITED

 ifndef MODE
--- a/build/debugsoft/MakerTitle/TitleList/Makefile
+++ b/build/debugsoft/MakerTitle/TitleList/Makefile
@ -18,7 +18,7 @@


 override TARGET_PLATFORM	= TWL
-override TARGET_CODEGEN		= ARM
+override TWL_CODEGEN		= ARM
 override TWL_ARCHGEN		= LIMITED


--- a/build/debugsoft/Wireless/WifiIcon/Makefile
+++ b/build/debugsoft/Wireless/WifiIcon/Makefile
@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	= TWL
-override TARGET_CODEGEN		= ARM
+override TWL_CODEGEN		= ARM
 override TWL_ARCHGEN		= LIMITED


--- a/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile
+++ b/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile
@ -12,12 +12,12 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED

 override TARGET_FINALROM	:= TRUE
--- a/build/gcdfirm/sdmc-launcher-writer/wram_regs/Makefile
+++ b/build/gcdfirm/sdmc-launcher-writer/wram_regs/Makefile
@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED

 override TARGET_FINALROM	:= TRUE
--- a/build/gcdfirm/sdmc-launcher/wram_regs/Makefile
+++ b/build/gcdfirm/sdmc-launcher/wram_regs/Makefile
@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED

 override TARGET_FINALROM	:= TRUE
--- a/build/libraries/aes/ARM7/Makefile
+++ b/build/libraries/aes/ARM7/Makefile
@ -12,8 +12,8 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 SUBDIRS		=
@ -23,7 +23,7 @@ SUBMAKES	=
 #----------------------------------------------------------------------------

 # build ARM & THUMB libraries
-TWL_CODEGEN_ALL 	?= TRUE
+override TWL_CODEGEN 	= ALL

 # Codegen for sub processer
 TWL_PROC		= ARM7
--- a/build/libraries/fs/ARM7/Makefile
+++ b/build/libraries/fs/ARM7/Makefile
@ -23,7 +23,7 @@ SUBMAKES	=
 #----------------------------------------------------------------------------

 # build ARM & THUMB libraries
-TWL_CODEGEN_ALL 	?= TRUE
+override TWL_CODEGEN 	= ALL

 # Codegen for sub processer
 TWL_PROC		= ARM7
--- a/build/libraries/nvram/ARM7/Makefile
+++ b/build/libraries/nvram/ARM7/Makefile
@ -21,7 +21,7 @@ SUBDIRS				=
 #----------------------------------------------------------------------------

 # build ARM & THUMB libraries
-TWL_CODEGEN_ALL 	?=	True
+override TWL_CODEGEN 	= ALL

 TWL_PROC			=	ARM7

--- a/build/libraries/os/ARM7/Makefile
+++ b/build/libraries/os/ARM7/Makefile
@ -12,8 +12,8 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 SUBDIRS			=
@ -21,7 +21,7 @@ SUBDIRS			=
 #----------------------------------------------------------------------------

 # build ARM & THUMB libraries
-TWL_CODEGEN_ALL 	?= TRUE
+override TWL_CODEGEN 	= ALL

 # Codegen for sub processer
 TWL_PROC		= ARM7
--- a/build/libraries/pm/ARM7/Makefile
+++ b/build/libraries/pm/ARM7/Makefile
@ -12,8 +12,8 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 SUBDIRS		=
@ -23,7 +23,7 @@ SUBMAKES	=
 #----------------------------------------------------------------------------

 # build ARM & THUMB libraries
-TWL_CODEGEN_ALL 	?= TRUE
+override TWL_CODEGEN 	= ALL

 # Codegen for sub processer
 TWL_PROC		= ARM7
--- a/build/libraries/pxi/ARM7/Makefile
+++ b/build/libraries/pxi/ARM7/Makefile
@ -12,8 +12,8 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 SUBDIRS			=
@ -21,7 +21,7 @@ SUBDIRS			=
 #----------------------------------------------------------------------------

 # build ARM & THUMB libraries
-TWL_CODEGEN_ALL 	?= TRUE
+override TWL_CODEGEN 	= ALL

 # Codegen for sub processer
 TWL_PROC		= ARM7
--- a/build/libraries_sysmenu/Makefile
+++ b/build/libraries_sysmenu/Makefile
@ -34,8 +34,8 @@ SUBDIRS			=		reloc_info \
 						dht \
 						wds \
 						errorLog \
-						TwlWireless \
 						nwm \
+#						TwlWireless \
 #						acsign \

 #----------------------------------------------------------------------------
--- a/build/libraries_sysmenu/boot/ARM7/Makefile
+++ b/build/libraries_sysmenu/boot/ARM7/Makefile
@ -23,6 +23,7 @@ TARGET_FIRM			=	SYSTEMMENU
 TARGET_PLATFORM		=	TWL
 TWL_ARCHGEN			=	LIMITED
 TWL_PROC	    	=	ARM7
+override TWL_CODEGEN 	= ALL

 #----------------------------------------------------------------------------

--- a/build/libraries_sysmenu/dht/ARM7/Makefile
+++ b/build/libraries_sysmenu/dht/ARM7/Makefile
@ -23,6 +23,7 @@ TARGET_FIRM			=	SYSTEMMENU
 TARGET_PLATFORM		=	TWL
 TWL_ARCHGEN			=	LIMITED
 TWL_PROC	   		=	ARM7
+override TWL_CODEGEN 	= ALL

 SRCDIR				=	../common/src
 SRCS				=	dht.c
--- a/build/libraries_sysmenu/ds/ARM7/Makefile
+++ b/build/libraries_sysmenu/ds/ARM7/Makefile
@ -23,6 +23,7 @@ TARGET_FIRM			=	SYSTEMMENU
 TARGET_PLATFORM		=	TWL
 TWL_ARCHGEN			=	LIMITED
 TWL_PROC	    	=	ARM7
+override TWL_CODEGEN 	= ALL

 #----------------------------------------------------------------------------

--- a/build/libraries_sysmenu/hotsw/ARM7/Makefile
+++ b/build/libraries_sysmenu/hotsw/ARM7/Makefile
@ -23,6 +23,7 @@ TARGET_FIRM			=	SYSTEMMENU
 TARGET_PLATFORM		=	TWL
 TWL_ARCHGEN			=	LIMITED
 TWL_PROC	    	=	ARM7
+override TWL_CODEGEN 	= ALL

 #----------------------------------------------------------------------------

--- a/build/libraries_sysmenu/mcu/ARM7/Makefile
+++ b/build/libraries_sysmenu/mcu/ARM7/Makefile
@ -23,6 +23,7 @@ TARGET_FIRM			=	SYSTEMMENU
 TARGET_PLATFORM		=	TWL
 TWL_ARCHGEN			=	LIMITED
 TWL_PROC	    	=	ARM7
+override TWL_CODEGEN 	= ALL

 #----------------------------------------------------------------------------

--- a/build/libraries_sysmenu/nwm/ARM7/Makefile
+++ b/build/libraries_sysmenu/nwm/ARM7/Makefile
@ -27,7 +27,7 @@ override TARGET_PLATFORM = TWL
 TWL_PROC		 = ARM7

 # build ARM & THUMB libraries
-TWL_CODEGEN		?= ALL
+override TWL_CODEGEN 	= ALL

 MACRO_FLAGS  = -DSDK_SYSMENU_BUILD

--- a/build/libraries_sysmenu/reloc_info/ARM7/Makefile
+++ b/build/libraries_sysmenu/reloc_info/ARM7/Makefile
@ -23,6 +23,7 @@ TARGET_FIRM			=	SYSTEMMENU
 TARGET_PLATFORM		=	TWL
 TWL_ARCHGEN			=	LIMITED
 TWL_PROC	    	=	ARM7
+override TWL_CODEGEN 	= ALL

 #----------------------------------------------------------------------------

--- a/build/libraries_sysmenu/sysmenu/ARM7/Makefile
+++ b/build/libraries_sysmenu/sysmenu/ARM7/Makefile
@ -23,6 +23,7 @@ TARGET_FIRM			=	SYSTEMMENU
 TARGET_PLATFORM		=	TWL
 TWL_ARCHGEN			=	LIMITED
 TWL_PROC	   		=	ARM7
+override TWL_CODEGEN 	= ALL

 SRCS_COMMON			=	status.c \
 						pxi.c \
--- a/build/nandfirm/menu-launcher/wram_regs/Makefile
+++ b/build/nandfirm/menu-launcher/wram_regs/Makefile
@ -12,12 +12,12 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED

 override TARGET_FINALROM	:= TRUE
--- a/build/nandfirm/sdmc-launcher/wram_regs/Makefile
+++ b/build/nandfirm/sdmc-launcher/wram_regs/Makefile
@ -12,12 +12,12 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED

 override TARGET_FINALROM	:= TRUE
--- a/build/norfirm/firm-dev/wram_regs/Makefile
+++ b/build/norfirm/firm-dev/wram_regs/Makefile
@ -12,12 +12,12 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED

 override TARGET_FINALROM	:= TRUE
--- a/build/norfirm/norfirm-empty/Makefile
+++ b/build/norfirm/norfirm-empty/Makefile
@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED

 override TARGET_FINALROM	:= TRUE
--- a/build/norfirm/norfirm-print/wram_regs/Makefile
+++ b/build/norfirm/norfirm-print/wram_regs/Makefile
@ -12,12 +12,12 @@
 # in whole or in part, without the prior written consent of Nintendo.
 #
 # $Date::            $
-# $Rev:$
-# $Author:$
+# $Rev$
+# $Author$
 #----------------------------------------------------------------------------

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED

 override TARGET_FINALROM	:= TRUE
--- a/build/systemMenu_RED/DSHashTable/Makefile
+++ b/build/systemMenu_RED/DSHashTable/Makefile
@ -19,7 +19,7 @@
 TARGET_FIRM			=	SYSTEMMENU

 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TWL_CODEGEN		:= ARM
 override TWL_ARCHGEN		:= LIMITED
 TWL_NANDAPP			=	TRUE

--- a/build/systemMenu_RED/Launcher/ARM9/Makefile
+++ b/build/systemMenu_RED/Launcher/ARM9/Makefile
@ -53,7 +53,7 @@ SYSM_DISABLE_DEBUG					?=	FALSE

 TARGET_FIRM				=	SYSTEMMENU
 TARGET_PLATFORM			=	TWL
-TWL_CODEGEN				=	ARM
+TWL_CODEGEN				?=	THUMB
 TWL_ARCHGEN				=	LIMITED
 TWL_NANDAPP				=	TRUE

--- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile
+++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
@ -31,6 +31,7 @@ SYSM_DISABLE_DEBUG		?=	FALSE

 TARGET_FIRM				=	SYSTEMMENU
 TARGET_PLATFORM			=	TWL
+TWL_CODEGEN				?=	THUMB
 TWL_ARCHGEN				=	LIMITED
 TWL_NANDAPP				=	TRUE

--- a/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile
+++ b/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile
@ -21,7 +21,7 @@ override TWL_PROC			=	ARM7
 override TWL_ARCHGEN		=	LIMITED
 ##override TWL_PLATFORM		=	TS
 TWL_NO_STD_PCHDR			=	True
-##TWL_CODEGEN					?=	ALL
+override TWL_CODEGEN		=	ARM

 ifndef	TWLSDK_NOCRYPTO
 #----------------------------------------------------------------------------
--- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile
+++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile
@ -21,7 +21,7 @@ override TWL_PROC			=	ARM7
 override TWL_ARCHGEN		=	LIMITED
 ##override TWL_PLATFORM		=	TS
 TWL_NO_STD_PCHDR			=	True
-##TWL_CODEGEN					?=	ALL
+override TWL_CODEGEN		=	ARM

 ifndef	TWLSDK_NOCRYPTO
 #----------------------------------------------------------------------------
--- a/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile
+++ b/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile
@ -21,7 +21,7 @@ override TWL_PROC			=	ARM7
 override TWL_ARCHGEN		=	LIMITED
 ##override TWL_PLATFORM		=	TS
 TWL_NO_STD_PCHDR			=	True
-##TWL_CODEGEN					?=	ALL
+override TWL_CODEGEN		=	ARM

 ifndef	TWLSDK_NOCRYPTO
 #----------------------------------------------------------------------------
--- a/tools/bin/makerom.TWL.launcher.exe
+++ b/tools/bin/makerom.TWL.launcher.exe