From bb1732d800639a94c20fbeb1e6a02e2cf2806255 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Fri, 15 Aug 2008 12:09:14 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?= =?UTF-8?q?=E3=83=88=E3=81=A7RED=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3?= =?UTF-8?q?=E3=83=BC=E3=80=81RED=E6=9C=AC=E4=BD=93=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=80=81NandInitializer=E3=81=AA=E3=81=A9=E3=81=AEARM9?= =?UTF-8?q?=E5=81=B4=E3=82=92THUMB=E3=81=AB=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E5=A4=89=E6=9B=B4=E3=80=82=20=E3=80=80=EF=BC=88nandfi?= =?UTF-8?q?rm=E3=81=AA=E3=81=A9=E3=81=AE=E3=83=95=E3=82=A1=E3=83=BC?= =?UTF-8?q?=E3=83=A0=E7=B3=BB=E3=81=AFARM9=E3=82=82ARM=E3=81=AE=E3=81=BE?= =?UTF-8?q?=E3=81=BE=EF=BC=89=20=E3=83=BB=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E6=95=B4?= =?UTF-8?q?=E7=90=86=E3=80=82=E5=95=8F=E9=A1=8C=E3=81=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=A8=E3=81=93=E3=82=8D=E3=81=AF=E3=80=81=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?TARGET=5FCODEGEN=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4=E3=80=82=20=E3=83=BBNitroS?= =?UTF-8?q?ystem=E3=82=92LTD,HYB=E4=B8=A1=E6=96=B9=E3=81=A7ARM,THUMB?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2167 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- Makefile | 3 +- Makefile.full | 11 ++---- Makefile.nitroSystem.HYB | 36 +++++++++++++++++++ Makefile.nitroSystem.LTD | 36 +++++++++++++++++++ Makefile.sysmenu | 3 +- Makefile.twlSDK | 35 ++++++++++++++++++ build/buildtools/commondefs.sysmenu | 3 ++ build/components/hyena.TWL/Makefile | 2 +- build/components/jackal.TWL/Makefile | 2 +- build/debugsoft/Jpeg/SdToPhoto/Makefile | 2 +- .../SaveData/DisplayVersion/Makefile | 2 +- build/debugsoft/MakerTitle/TitleList/Makefile | 2 +- build/debugsoft/Wireless/WifiIcon/Makefile | 2 +- build/gcdfirm/gcdfirm-disp/wram_regs/Makefile | 2 +- .../sdmc-launcher-writer/wram_regs/Makefile | 2 +- .../gcdfirm/sdmc-launcher/wram_regs/Makefile | 2 +- build/libraries/init/ARM9/Makefile | 2 +- build/libraries/mi/ARM9/Makefile | 6 ++-- build/libraries/os/ARM9/Makefile | 6 ++-- build/libraries/pxi/ARM9/Makefile | 6 ++-- .../nandfirm/menu-launcher/wram_regs/Makefile | 2 +- .../nandfirm/sdmc-launcher/wram_regs/Makefile | 2 +- build/norfirm/firm-dev/wram_regs/Makefile | 2 +- build/norfirm/norfirm-empty/Makefile | 2 +- .../norfirm/norfirm-print/wram_regs/Makefile | 2 +- build/systemMenu_RED/DSHashTable/Makefile | 2 +- build/systemMenu_RED/Launcher/ARM9/Makefile | 2 +- .../MachineSettings/ARM9/Makefile | 6 ++-- build/systemMenu_mastering/Makefile | 2 +- .../ImportJump/ARM9.TWL/Makefile | 2 +- .../NandInitializer/ARM9.TWL/Makefile | 2 +- .../ARM7.TWL/Makefile | 2 +- .../ARM9.TWL/Makefile | 2 +- .../NandInitializerRed/ARM7.TWL/Makefile | 2 +- .../NandInitializerRed/ARM9.TWL/Makefile | 2 +- .../SystemUpdater/ARM7.TWL/Makefile | 2 +- .../SystemUpdater/ARM9.TWL/Makefile | 2 +- build/tests/CheckDSHashTable/Makefile | 3 ++ .../DisplaySystemInformation/ARM7/Makefile | 2 +- .../ARM7_armadillo/Makefile | 2 +- .../ARM7_racoon/Makefile | 2 +- build/tests/HashCheckTemplate/ARM7/Makefile | 2 +- .../tests/HashCheckTemplate/crt/ARM7/Makefile | 2 +- .../Launcher_sdlog/sdlog/ARM7.TWL/Makefile | 2 +- .../Launcher_sdlog/sdlog/ARM9.TWL/Makefile | 2 +- build/tests/Makefile | 24 +++++++++++++ build/tests/RelocateChecker/ARM7/Makefile.0 | 2 +- build/tests/RelocateChecker/ARM7/Makefile.1 | 2 +- build/tests/RelocateChecker/ARM7/Makefile.2 | 2 +- build/tests/RelocateChecker/ARM7/Makefile.3 | 2 +- build/tests/RelocateChecker/ARM7/Makefile.4 | 2 +- build/tests/RelocateChecker/ARM7/Makefile.5 | 2 +- .../RelocateChecker/crt/ARM7/Makefile.LTD | 2 +- .../RelocateChecker/crt/ARM9/Makefile.FLX | 4 +-- build/tests/WirelessChecker/Makefile | 2 +- .../libraries/nwm/ARM7/Makefile | 2 +- .../libraries/nwm/ARM9/Makefile | 2 +- .../libraries/nwm/scripts/Makefile | 2 +- 58 files changed, 198 insertions(+), 72 deletions(-) create mode 100644 Makefile.nitroSystem.HYB create mode 100644 Makefile.nitroSystem.LTD create mode 100644 Makefile.twlSDK diff --git a/Makefile b/Makefile index a80c2995..6b719a63 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ #! make -f #---------------------------------------------------------------------------- -# Project: TwlFirm - build +# Project: TwlIPL - build # File: Makefile # # Copyright 2007 Nintendo. All rights reserved. @@ -21,7 +21,6 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -export TWL_ARCHGEN = ALL SUBDIRS = \ build diff --git a/Makefile.full b/Makefile.full index 30d21a44..bb5620fe 100644 --- a/Makefile.full +++ b/Makefile.full @@ -1,6 +1,6 @@ #! make -f #---------------------------------------------------------------------------- -# Project: TwlFirm - build +# Project: TwlIPL - build # File: Makefile.full # # Copyright 2007 Nintendo. All rights reserved. @@ -21,15 +21,8 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -export TWL_ARCHGEN = ALL -export NITRO_WITHOUT_DEMOS = TRUE - -SUBDIRS = \ - $(ROOT)/build/libraries/reboot \ - $(ROOT)/build/demos/gx/UnitTours/DEMOLib \ - $(NITROSYSTEM_ROOT) \ - build +SUBMAKES = Makefile.twlSDK Makefile.nitroSystem.LTD Makefile.nitroSystem.HYB Makefile #---------------------------------------------------------------------------- diff --git a/Makefile.nitroSystem.HYB b/Makefile.nitroSystem.HYB new file mode 100644 index 00000000..31a71621 --- /dev/null +++ b/Makefile.nitroSystem.HYB @@ -0,0 +1,36 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL - build +# File: Makefile.nitroSystem +# +# 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$ +#---------------------------------------------------------------------------- + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + + +#---------------------------------------------------------------------------- +# 何故かよくわからないが、TARGET_ARCHGEN=ALLではダメ。TWL_ARCHGEN=HYBLIDでもダメ。。。 +export TARGET_ARCHGEN = HYBLID +export TARGET_CODEGEN = ALL +export NITRO_WITHOUT_DEMOS = TRUE + +SUBDIRS = $(NITROSYSTEM_ROOT) + + +#---------------------------------------------------------------------------- + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/Makefile.nitroSystem.LTD b/Makefile.nitroSystem.LTD new file mode 100644 index 00000000..d2a6b868 --- /dev/null +++ b/Makefile.nitroSystem.LTD @@ -0,0 +1,36 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL - build +# File: Makefile.nitroSystem +# +# 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$ +#---------------------------------------------------------------------------- + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + + +#---------------------------------------------------------------------------- +# 何故かよくわからないが、TARGET_ARCHGEN=ALLではダメ。TWL_ARCHGEN=ALL, TARGET_ARCHGEN=LIMITEDでもダメ。。。 +export TWL_ARCHGEN = LIMITED +export TARGET_CODEGEN = ALL +export NITRO_WITHOUT_DEMOS = TRUE + +SUBDIRS = $(NITROSYSTEM_ROOT) + + +#---------------------------------------------------------------------------- + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/Makefile.sysmenu b/Makefile.sysmenu index 43b4f9fa..6e26a5e6 100644 --- a/Makefile.sysmenu +++ b/Makefile.sysmenu @@ -1,6 +1,6 @@ #! make -f #---------------------------------------------------------------------------- -# Project: TwlFirm - build +# Project: TwlIPL - build # File: Makefile.sysmenu # # Copyright 2007 Nintendo. All rights reserved. @@ -23,7 +23,6 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -export TWL_ARCHGEN = ALL SUBDIRS = \ build/tools \ diff --git a/Makefile.twlSDK b/Makefile.twlSDK new file mode 100644 index 00000000..1efe62c5 --- /dev/null +++ b/Makefile.twlSDK @@ -0,0 +1,35 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL - build +# File: Makefile.twlSDK +# +# 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$ +#---------------------------------------------------------------------------- + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + + +#---------------------------------------------------------------------------- +export TARGET_ARCHGEN = ALL +export TARGET_CODEGEN = ALL + +SUBDIRS = \ + $(ROOT)/build/libraries/reboot \ + $(ROOT)/build/demos/gx/UnitTours/DEMOLib + +#---------------------------------------------------------------------------- + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index da133f99..137a1bde 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -27,6 +27,9 @@ define toLower $(shell echo $(1) | tr '[A-Z]' '[a-z]' ) endef # toLower +# デフォルトのCODEGENを指定（他のcommondefsの前で指定しておかないとダメ） +TARGET_CODEGEN ?= THUMB + #---------------------------------------------------------------------------- ### TWL-commondefs # diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile index f85e1e6a..1e3df7e8 100644 --- 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 -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM FIRM_LIBSUFFIX = .firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH) diff --git a/build/components/jackal.TWL/Makefile b/build/components/jackal.TWL/Makefile index 770497b3..d2c7b47a 100644 --- 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 -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM FIRM_LIBSUFFIX = .firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH) diff --git a/build/debugsoft/Jpeg/SdToPhoto/Makefile b/build/debugsoft/Jpeg/SdToPhoto/Makefile index 528c515f..3707d142 100644 --- a/build/debugsoft/Jpeg/SdToPhoto/Makefile +++ b/build/debugsoft/Jpeg/SdToPhoto/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM = TWL -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM override TWL_ARCHGEN = LIMITED diff --git a/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile b/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile index 65be5d9b..0bb8d479 100644 --- a/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile +++ b/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile @@ -18,7 +18,7 @@ override TARGET_PLATFORM = TWL -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM override TWL_ARCHGEN = LIMITED ifndef MODE diff --git a/build/debugsoft/MakerTitle/TitleList/Makefile b/build/debugsoft/MakerTitle/TitleList/Makefile index 2e657dd4..b2f2c5d2 100644 --- a/build/debugsoft/MakerTitle/TitleList/Makefile +++ b/build/debugsoft/MakerTitle/TitleList/Makefile @@ -18,7 +18,7 @@ override TARGET_PLATFORM = TWL -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM override TWL_ARCHGEN = LIMITED diff --git a/build/debugsoft/Wireless/WifiIcon/Makefile b/build/debugsoft/Wireless/WifiIcon/Makefile index 394e9fd9..abf9410a 100644 --- a/build/debugsoft/Wireless/WifiIcon/Makefile +++ b/build/debugsoft/Wireless/WifiIcon/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM = TWL -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM override TWL_ARCHGEN = LIMITED diff --git a/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile b/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile index e79917a2..1c1afc6d 100644 --- a/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile +++ b/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/gcdfirm/sdmc-launcher-writer/wram_regs/Makefile b/build/gcdfirm/sdmc-launcher-writer/wram_regs/Makefile index e79917a2..1c1afc6d 100644 --- 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 TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/gcdfirm/sdmc-launcher/wram_regs/Makefile b/build/gcdfirm/sdmc-launcher/wram_regs/Makefile index 4e9ffde9..76342425 100644 --- 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 TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/libraries/init/ARM9/Makefile b/build/libraries/init/ARM9/Makefile index 0160e317..e863b343 100644 --- a/build/libraries/init/ARM9/Makefile +++ b/build/libraries/init/ARM9/Makefile @@ -24,7 +24,7 @@ SUBDIRS = TWL_NO_STD_PCHDR = True # Avoid to build THUMB version object -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM SRCDIR = . ../common SRCS = crt0_firm.c \ diff --git a/build/libraries/mi/ARM9/Makefile b/build/libraries/mi/ARM9/Makefile index eb187cf6..6a59de28 100644 --- a/build/libraries/mi/ARM9/Makefile +++ b/build/libraries/mi/ARM9/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 +TARGET_CODEGEN_ALL ?= TRUE SRCDIR = . ../common diff --git a/build/libraries/os/ARM9/Makefile b/build/libraries/os/ARM9/Makefile index eeb8c37c..6c53b800 100644 --- a/build/libraries/os/ARM9/Makefile +++ b/build/libraries/os/ARM9/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 +TARGET_CODEGEN_ALL ?= TRUE SRCDIR = ../common . diff --git a/build/libraries/pxi/ARM9/Makefile b/build/libraries/pxi/ARM9/Makefile index d7d5361f..208491d2 100644 --- a/build/libraries/pxi/ARM9/Makefile +++ b/build/libraries/pxi/ARM9/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 +TARGET_CODEGEN_ALL ?= TRUE SRCDIR = ../common . diff --git a/build/nandfirm/menu-launcher/wram_regs/Makefile b/build/nandfirm/menu-launcher/wram_regs/Makefile index 4e9ffde9..76342425 100644 --- a/build/nandfirm/menu-launcher/wram_regs/Makefile +++ b/build/nandfirm/menu-launcher/wram_regs/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/nandfirm/sdmc-launcher/wram_regs/Makefile b/build/nandfirm/sdmc-launcher/wram_regs/Makefile index f7a40e84..8de72ccf 100644 --- a/build/nandfirm/sdmc-launcher/wram_regs/Makefile +++ b/build/nandfirm/sdmc-launcher/wram_regs/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/norfirm/firm-dev/wram_regs/Makefile b/build/norfirm/firm-dev/wram_regs/Makefile index a55b886a..04fed484 100644 --- a/build/norfirm/firm-dev/wram_regs/Makefile +++ b/build/norfirm/firm-dev/wram_regs/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile index b60f9d11..6c5a1ae7 100644 --- a/build/norfirm/norfirm-empty/Makefile +++ b/build/norfirm/norfirm-empty/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/norfirm/norfirm-print/wram_regs/Makefile b/build/norfirm/norfirm-print/wram_regs/Makefile index a55b886a..04fed484 100644 --- a/build/norfirm/norfirm-print/wram_regs/Makefile +++ b/build/norfirm/norfirm-print/wram_regs/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/systemMenu_RED/DSHashTable/Makefile b/build/systemMenu_RED/DSHashTable/Makefile index 1300b632..ca3b9478 100644 --- a/build/systemMenu_RED/DSHashTable/Makefile +++ b/build/systemMenu_RED/DSHashTable/Makefile @@ -19,7 +19,7 @@ TARGET_FIRM = SYSTEMMENU override TARGET_PLATFORM := TWL -override TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED TWL_NANDAPP = TRUE diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 4da7338b..0da71295 100644 --- 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 ?= THUMB +TARGET_CODEGEN ?= THUMB TWL_ARCHGEN = LIMITED TWL_NANDAPP = TRUE diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index 7389c00b..0bdeca14 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -31,7 +31,7 @@ SYSM_DISABLE_DEBUG ?= FALSE TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL -TWL_CODEGEN ?= THUMB +TARGET_CODEGEN ?= THUMB TWL_ARCHGEN = LIMITED TWL_NANDAPP = TRUE @@ -107,12 +107,10 @@ INSTALL_DIR = $(SDK_NMENU_DATADIR) #---------------------------------------------------------------------------- -do-build : test $(TARGETS) +do-build : $(TARGETS) include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules -test: - echo $(SMALL_TITLEID) #---------------------------------------------------------------------------- #===== End of Makefile ===== diff --git a/build/systemMenu_mastering/Makefile b/build/systemMenu_mastering/Makefile index a2cd5b0b..e857c37a 100644 --- a/build/systemMenu_mastering/Makefile +++ b/build/systemMenu_mastering/Makefile @@ -20,7 +20,7 @@ TARGET_FIRM = SYSTEMMENU -TWL_CODEGEN = ARM +TARGET_CODEGEN = ARM TWL_ARCHGEN = LIMITED TWL_NANDAPP = TRUE diff --git a/build/systemMenu_tools/ImportJump/ARM9.TWL/Makefile b/build/systemMenu_tools/ImportJump/ARM9.TWL/Makefile index 9ae63be9..b73fb31c 100644 --- a/build/systemMenu_tools/ImportJump/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/ImportJump/ARM9.TWL/Makefile @@ -29,7 +29,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -#TWL_CODEGEN = THUMB +#TARGET_CODEGEN = THUMB TITLEID_LO = 0IJA #TARGET_TAD = diff --git a/build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile index aabf00df..fe220930 100644 --- a/build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializer/ARM9.TWL/Makefile @@ -58,7 +58,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -#TWL_CODEGEN = THUMB +#TARGET_CODEGEN = THUMB TITLEID_LO = 0NIA #TARGET_TAD = diff --git a/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile b/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile index 0d6f1626..af17b0e1 100644 --- 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 -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM ifndef TWLSDK_NOCRYPTO #---------------------------------------------------------------------------- diff --git a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile index 39b575bb..f0c4bbc5 100644 --- a/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerProduction/ARM9.TWL/Makefile @@ -44,7 +44,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -#TWL_CODEGEN = THUMB +#TARGET_CODEGEN = THUMB TITLEID_LO = 0NPA #TARGET_TAD = diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile index 24fe25c9..330b89f4 100644 --- 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 -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM ifndef TWLSDK_NOCRYPTO #---------------------------------------------------------------------------- diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile index 27ad1c0d..089f4d82 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/Makefile @@ -40,7 +40,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -#TWL_CODEGEN = THUMB +#TARGET_CODEGEN = THUMB TITLEID_LO = 0NRA #TARGET_TAD = diff --git a/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile b/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile index 90af5f70..e333b1fc 100644 --- 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 -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM ifndef TWLSDK_NOCRYPTO #---------------------------------------------------------------------------- diff --git a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile index 7cd2bf1a..423adc2e 100644 --- a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/Makefile @@ -30,7 +30,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -#TWL_CODEGEN = THUMB +#TARGET_CODEGEN = THUMB TITLEID_LO = 0SUA #TARGET_TAD = diff --git a/build/tests/CheckDSHashTable/Makefile b/build/tests/CheckDSHashTable/Makefile index 285af9a5..3ca763d7 100644 --- a/build/tests/CheckDSHashTable/Makefile +++ b/build/tests/CheckDSHashTable/Makefile @@ -32,6 +32,9 @@ DS_HASH_TABLE_SRL_ROOT ?= D:/SRL include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +LLIBRARIES += libdht$(TWL_LIBSUFFIX).a + + MAKEROM_FLAGS += -DMAKEROM_SRL_ROOT=$(DS_HASH_TABLE_SRL_ROOT) diff --git a/build/tests/DisplaySystemInformation/ARM7/Makefile b/build/tests/DisplaySystemInformation/ARM7/Makefile index c42c28e5..eab0b68e 100644 --- a/build/tests/DisplaySystemInformation/ARM7/Makefile +++ b/build/tests/DisplaySystemInformation/ARM7/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 +TARGET_CODEGEN ?= ALL #---------------------------------------------------------------------------- DISP_INFO = $(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation diff --git a/build/tests/DisplaySystemInformation/ARM7_armadillo/Makefile b/build/tests/DisplaySystemInformation/ARM7_armadillo/Makefile index 45f7903d..16d7b87c 100644 --- a/build/tests/DisplaySystemInformation/ARM7_armadillo/Makefile +++ b/build/tests/DisplaySystemInformation/ARM7_armadillo/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 +TARGET_CODEGEN ?= ALL #---------------------------------------------------------------------------- DISP_INFO = $(call eupath,$(TWL_IPL_RED_ROOT)/build/tests/DisplaySystemInformation) diff --git a/build/tests/DisplaySystemInformation/ARM7_racoon/Makefile b/build/tests/DisplaySystemInformation/ARM7_racoon/Makefile index 8c504b23..bc239513 100644 --- a/build/tests/DisplaySystemInformation/ARM7_racoon/Makefile +++ b/build/tests/DisplaySystemInformation/ARM7_racoon/Makefile @@ -20,7 +20,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ALL +TARGET_CODEGEN ?= ALL #---------------------------------------------------------------------------- diff --git a/build/tests/HashCheckTemplate/ARM7/Makefile b/build/tests/HashCheckTemplate/ARM7/Makefile index fb762b13..76f7b530 100644 --- a/build/tests/HashCheckTemplate/ARM7/Makefile +++ b/build/tests/HashCheckTemplate/ARM7/Makefile @@ -20,7 +20,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ALL +TARGET_CODEGEN ?= ALL #---------------------------------------------------------------------------- diff --git a/build/tests/HashCheckTemplate/crt/ARM7/Makefile b/build/tests/HashCheckTemplate/crt/ARM7/Makefile index 45e88e78..9b602b3f 100644 --- a/build/tests/HashCheckTemplate/crt/ARM7/Makefile +++ b/build/tests/HashCheckTemplate/crt/ARM7/Makefile @@ -25,7 +25,7 @@ override TWL_PROC = ARM7 TWL_NO_STD_PCHDR = True # Avoid to build THUMB version object -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM # Avoid to build HYBRID version object override TWL_ARCHGEN = LIMITED diff --git a/build/tests/Launcher_sdlog/sdlog/ARM7.TWL/Makefile b/build/tests/Launcher_sdlog/sdlog/ARM7.TWL/Makefile index 208a8898..75ec2c71 100644 --- a/build/tests/Launcher_sdlog/sdlog/ARM7.TWL/Makefile +++ b/build/tests/Launcher_sdlog/sdlog/ARM7.TWL/Makefile @@ -21,7 +21,7 @@ SUBDIRS = #---------------------------------------------------------------------------- override TARGET_PLATFORM = TWL -TWL_CODEGEN ?= ARM +TARGET_CODEGEN ?= ARM TWL_ARCHGEN ?= LIMITED TWL_PROC = ARM7 diff --git a/build/tests/Launcher_sdlog/sdlog/ARM9.TWL/Makefile b/build/tests/Launcher_sdlog/sdlog/ARM9.TWL/Makefile index 10a2701a..dca6850a 100644 --- a/build/tests/Launcher_sdlog/sdlog/ARM9.TWL/Makefile +++ b/build/tests/Launcher_sdlog/sdlog/ARM9.TWL/Makefile @@ -17,7 +17,7 @@ TARGET_PLATFORM := TWL TWL_PROC = ARM9 -TWL_CODEGEN ?= ARM +TARGET_CODEGEN ?= ARM TWL_ARCHGEN ?= LIMITED SRCDIR = ./src diff --git a/build/tests/Makefile b/build/tests/Makefile index 6f7c69f0..cec4e1e7 100644 --- a/build/tests/Makefile +++ b/build/tests/Makefile @@ -20,6 +20,30 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- +SUBDIRS_P = \ + CheckDSHashTable \ + FatalErrorMaker \ + RomTypeTest \ + WirelessChecker \ + CheckPreloadParameters \ + FileRecoveryTest \ + Shared2File \ + build4WLDev \ + CheckSharedFont \ + HashCheckTemplate \ + SimpleBenchmark \ + compressSharedFontLoad/compSharedFont \ + compressSharedFontLoad/testLoadSpeed \ + DisplaySystemInformation \ + Launcher_sdlog \ + TestMaker \ + yuv2rgb \ + ErrorLogTest \ + Makefile \ + WDSTest \ + FatalErrorChecker \ + RelocateChecker \ + WDSWrapperTest \ #---------------------------------------------------------------------------- diff --git a/build/tests/RelocateChecker/ARM7/Makefile.0 b/build/tests/RelocateChecker/ARM7/Makefile.0 index 42226481..87d81b6f 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.0 +++ b/build/tests/RelocateChecker/ARM7/Makefile.0 @@ -21,7 +21,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ARM +TARGET_CODEGEN ?= ARM #---------------------------------------------------------------------------- diff --git a/build/tests/RelocateChecker/ARM7/Makefile.1 b/build/tests/RelocateChecker/ARM7/Makefile.1 index 8c2c7734..919e877c 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.1 +++ b/build/tests/RelocateChecker/ARM7/Makefile.1 @@ -21,7 +21,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ARM +TARGET_CODEGEN ?= ARM #---------------------------------------------------------------------------- diff --git a/build/tests/RelocateChecker/ARM7/Makefile.2 b/build/tests/RelocateChecker/ARM7/Makefile.2 index 3858b40e..5821b547 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.2 +++ b/build/tests/RelocateChecker/ARM7/Makefile.2 @@ -21,7 +21,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ARM +TARGET_CODEGEN ?= ARM #---------------------------------------------------------------------------- diff --git a/build/tests/RelocateChecker/ARM7/Makefile.3 b/build/tests/RelocateChecker/ARM7/Makefile.3 index c6d3a118..6b31f807 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.3 +++ b/build/tests/RelocateChecker/ARM7/Makefile.3 @@ -21,7 +21,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ARM +TARGET_CODEGEN ?= ARM #---------------------------------------------------------------------------- diff --git a/build/tests/RelocateChecker/ARM7/Makefile.4 b/build/tests/RelocateChecker/ARM7/Makefile.4 index 76a10674..34b2c643 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.4 +++ b/build/tests/RelocateChecker/ARM7/Makefile.4 @@ -21,7 +21,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ARM +TARGET_CODEGEN ?= ARM #---------------------------------------------------------------------------- diff --git a/build/tests/RelocateChecker/ARM7/Makefile.5 b/build/tests/RelocateChecker/ARM7/Makefile.5 index 5b3217aa..39198ac4 100644 --- a/build/tests/RelocateChecker/ARM7/Makefile.5 +++ b/build/tests/RelocateChecker/ARM7/Makefile.5 @@ -21,7 +21,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ARM +TARGET_CODEGEN ?= ARM #---------------------------------------------------------------------------- diff --git a/build/tests/RelocateChecker/crt/ARM7/Makefile.LTD b/build/tests/RelocateChecker/crt/ARM7/Makefile.LTD index 95731aed..92bbf471 100644 --- a/build/tests/RelocateChecker/crt/ARM7/Makefile.LTD +++ b/build/tests/RelocateChecker/crt/ARM7/Makefile.LTD @@ -25,7 +25,7 @@ override TWL_PROC = ARM7 TWL_NO_STD_PCHDR = True # Avoid to build THUMB version object -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM override TWL_ARCHGEN = LIMITED diff --git a/build/tests/RelocateChecker/crt/ARM9/Makefile.FLX b/build/tests/RelocateChecker/crt/ARM9/Makefile.FLX index 4bb3adf6..3c30e24f 100644 --- a/build/tests/RelocateChecker/crt/ARM9/Makefile.FLX +++ b/build/tests/RelocateChecker/crt/ARM9/Makefile.FLX @@ -22,7 +22,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM9 # Avoid to build THUMB version object -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM # Avoid to build LIMITED version object override TWL_ARCHGEN = HYBRID @@ -31,7 +31,7 @@ override TWL_ARCHGEN = HYBRID TWL_NO_STD_PCHDR = True # build ARM & THUMB libraries -TWL_CODEGEN ?= ALL +TARGET_CODEGEN ?= ALL SRCDIR = ../common/src src INCDIR = ../common/include diff --git a/build/tests/WirelessChecker/Makefile b/build/tests/WirelessChecker/Makefile index bb75e662..9891a6d1 100644 --- a/build/tests/WirelessChecker/Makefile +++ b/build/tests/WirelessChecker/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM = TWL -override TWL_CODEGEN = ARM +override TARGET_CODEGEN = ARM override TWL_ARCHGEN = LIMITED SUBDIRS = libraries components rsf banner diff --git a/build/tests/WirelessChecker/libraries/nwm/ARM7/Makefile b/build/tests/WirelessChecker/libraries/nwm/ARM7/Makefile index fb996b9d..3d20987a 100644 --- a/build/tests/WirelessChecker/libraries/nwm/ARM7/Makefile +++ b/build/tests/WirelessChecker/libraries/nwm/ARM7/Makefile @@ -25,7 +25,7 @@ override TARGET_PLATFORM = TWL TWL_PROC = ARM7 # build ARM & THUMB libraries -TWL_CODEGEN ?= ALL +TARGET_CODEGEN ?= ALL MACRO_FLAGS = -DNWM_WRACK_FIRMWARE diff --git a/build/tests/WirelessChecker/libraries/nwm/ARM9/Makefile b/build/tests/WirelessChecker/libraries/nwm/ARM9/Makefile index aa35f646..e8ecb1e6 100644 --- a/build/tests/WirelessChecker/libraries/nwm/ARM9/Makefile +++ b/build/tests/WirelessChecker/libraries/nwm/ARM9/Makefile @@ -21,7 +21,7 @@ override TARGET_PLATFORM = TWL # Codegen for sub processer TWL_PROC = ARM9 -TWL_CODEGEN ?= ALL +TARGET_CODEGEN ?= ALL MACRO_FLAGS = -DNWM_WRACK_FIRMWARE diff --git a/build/tests/WirelessChecker/libraries/nwm/scripts/Makefile b/build/tests/WirelessChecker/libraries/nwm/scripts/Makefile index 23d56e70..2582bc5b 100644 --- a/build/tests/WirelessChecker/libraries/nwm/scripts/Makefile +++ b/build/tests/WirelessChecker/libraries/nwm/scripts/Makefile @@ -16,7 +16,7 @@ # $Author$ #---------------------------------------------------------------------------- -override TWL_CODEGEN := ARM +override TARGET_CODEGEN := ARM override TWL_ARCHGEN := LIMITED NWM_ORG = $(ROOT)/build/libraries/wm/common.TWL/src/nwm_installfirm.c