From c574e36a5acc2b94b28c97f70a1a1f7f2592f8c4 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Thu, 6 Dec 2007 01:58:02 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=BBSDK=E3=83=AA=E3=83=93=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B32885=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=80=82=20?= =?UTF-8?q?=E3=83=BB=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0TWLIPL=5FROOT?= =?UTF-8?q?=E3=82=92TWL=5FIPL=5FRED=5FROOT=E3=81=AB=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=80=82=20=E3=83=BBHWInfo=E3=81=AE=E9=8D=B5=E3=83=9A=E3=82=A2?= =?UTF-8?q?=E3=82=92=E5=B7=AE=E3=81=97=E6=9B=BF=E3=81=88=E3=80=82=20?= =?UTF-8?q?=E3=83=BBhyena=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=A7=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88?= =?UTF-8?q?=E5=90=8D=E3=81=8C=E3=81=A1=E3=82=83=E3=82=93=E3=81=A8Printf?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=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@318 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- Makefile | 4 +- Makefile.full | 8 +- Makefile.sysmenu | 4 +- build/Makefile | 4 +- build/buildtools/commondefs | 4 +- build/buildtools/commondefs.firm | 4 +- build/buildtools/commondefs.sysmenu | 2 +- build/buildtools/modulerules | 4 +- build/buildtools/modulerules.firm | 4 +- build/components/Makefile | 4 +- build/components/hyena.TWL/Makefile | 4 +- build/components/hyena.TWL/src/main.c | 12 +- build/libraries/Makefile | 4 +- build/libraries/aes/ARM7/Makefile | 4 +- build/libraries/aes/ARM9/Makefile | 8 +- build/libraries/aes/Makefile | 4 +- build/libraries/fatfs/ARM7/Makefile | 4 +- build/libraries/fatfs/ARM9/Makefile | 4 +- build/libraries/fatfs/Makefile | 4 +- build/libraries/fs/ARM7/Makefile | 8 +- build/libraries/fs/ARM9/Makefile | 8 +- build/libraries/fs/Makefile | 4 +- build/libraries/gcd/ARM7/Makefile | 4 +- build/libraries/gcd/ARM9/Makefile | 4 +- build/libraries/gcd/Makefile | 4 +- build/libraries/init/ARM7/Makefile | 4 +- build/libraries/init/ARM9/Makefile | 4 +- build/libraries/init/Makefile | 4 +- build/libraries/mi/ARM9/Makefile | 4 +- build/libraries/mi/Makefile | 4 +- build/libraries/os/ARM7/Makefile | 4 +- build/libraries/os/ARM9/Makefile | 4 +- build/libraries/os/Makefile | 4 +- build/libraries/pm/ARM7/Makefile | 4 +- build/libraries/pm/Makefile | 4 +- build/libraries/pxi/ARM7/Makefile | 4 +- build/libraries/pxi/ARM9/Makefile | 4 +- build/libraries/pxi/Makefile | 4 +- build/libraries_sysmenu/Makefile | 4 +- build/libraries_sysmenu/acsign/ARM9/Makefile | 4 +- build/libraries_sysmenu/acsign/Makefile | 4 +- build/libraries_sysmenu/boot/ARM7/Makefile | 4 +- build/libraries_sysmenu/boot/ARM9/Makefile | 4 +- build/libraries_sysmenu/boot/Makefile | 4 +- build/libraries_sysmenu/hotsw/ARM7/Makefile | 4 +- build/libraries_sysmenu/hotsw/Makefile | 4 +- .../libraries_sysmenu/mb_loader/ARM7/Makefile | 4 +- .../libraries_sysmenu/mb_loader/ARM9/Makefile | 4 +- build/libraries_sysmenu/mb_loader/Makefile | 4 +- .../reset_param/ARM9/Makefile | 4 +- build/libraries_sysmenu/reset_param/Makefile | 4 +- .../libraries_sysmenu/settings/ARM9/Makefile | 4 +- .../settings/ARM9/src/TWLHWInfo.c | 16 +- build/libraries_sysmenu/settings/Makefile | 4 +- build/libraries_sysmenu/sysmenu/ARM9/Makefile | 4 +- .../sysmenu/ARM9/src/mountInfo.c | 2 +- build/libraries_sysmenu/sysmenu/Makefile | 4 +- build/nandfirm/Makefile | 4 +- build/nandfirm/menu-launcher/ARM7/Makefile | 4 +- build/nandfirm/menu-launcher/ARM9/Makefile | 4 +- build/nandfirm/menu-launcher/Makefile | 4 +- .../nandfirm/menu-launcher/wram_regs/Makefile | 4 +- build/nandfirm/nandfirm-print/Makefile | 4 +- build/nandfirm/sdmc-launcher/ARM7/Makefile | 4 +- build/nandfirm/sdmc-launcher/ARM9/Makefile | 4 +- build/nandfirm/sdmc-launcher/Makefile | 4 +- .../nandfirm/sdmc-launcher/wram_regs/Makefile | 4 +- build/norfirm/Makefile | 4 +- build/norfirm/norfirm-empty/Makefile | 4 +- build/norfirm/norfirm-print/ARM7/Makefile | 4 +- build/norfirm/norfirm-print/ARM9/Makefile | 4 +- build/norfirm/norfirm-print/Makefile | 4 +- .../norfirm/norfirm-print/wram_regs/Makefile | 4 +- .../DS_DownloadPlay/ARM9/Makefile | 4 +- .../DS_DownloadPlay/banner/Makefile | 4 +- .../systemMenu_RED/HWInfoWriter/ARM9/Makefile | 4 +- .../HWInfoWriter/banner/Makefile | 4 +- build/systemMenu_RED/Launcher/ARM9/Makefile | 4 +- .../MachineSettings/ARM9/Makefile | 4 +- .../MachineSettings/banner/Makefile | 4 +- build/systemMenu_RED/PictoChat/ARM9/Makefile | 4 +- .../systemMenu_RED/PictoChat/banner/Makefile | 4 +- build/tools/acsign/Makefile | 4 +- build/tools/makegcdfirm/Makefile | 2 +- build/tools/makegcdfirm/test/Makefile | 2 +- .../tools/makegcdfirm/test/wram_rbin/Makefile | 4 +- build/tools/makenandfirm/Makefile | 2 +- .../makenandfirm/test/wram_rbin/Makefile | 4 +- build/tools/makenorfirm/Makefile | 2 +- .../tools/makenorfirm/test/wram_rbin/Makefile | 4 +- keys/HWInfo/privKeyHWInfo.der | Bin 607 -> 609 bytes keys/HWInfo/privKeyHWInfo.pem | 26 +- keys/HWInfo/pubKeyHWInfo.der | Bin 162 -> 162 bytes keys/HWInfo/pubKeyHWInfo.pem | 8 +- keys/HWInfo/rand.dat | 65536 ++++++++++++++++ 95 files changed, 65742 insertions(+), 212 deletions(-) create mode 100644 keys/HWInfo/rand.dat diff --git a/Makefile b/Makefile index 0ae91427..2248c351 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # $Author: yosiokat $ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -27,7 +27,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/Makefile.full b/Makefile.full index 12f7d7cb..6c2db8c7 100644 --- a/Makefile.full +++ b/Makefile.full @@ -12,11 +12,11 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -35,7 +35,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/Makefile.sysmenu b/Makefile.sysmenu index a7a14ab2..e4a6f97e 100644 --- a/Makefile.sysmenu +++ b/Makefile.sysmenu @@ -16,7 +16,7 @@ # $Author$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -29,7 +29,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/Makefile b/build/Makefile index e31a98d5..c80a81fc 100644 --- a/build/Makefile +++ b/build/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -31,7 +31,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index d091bed7..e5c82932 100644 --- a/build/buildtools/commondefs +++ b/build/buildtools/commondefs @@ -20,9 +20,9 @@ TWL_IPL_COMMONDEFS_ = TRUE ifeq ($(TARGET_FIRM),SYSTEMMENU) -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs.sysmenu else -include $(TWLIPL_ROOT)/build/buildtools/commondefs.firm +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs.firm endif #---------------------------------------------------------------------------- diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm index 2b4850ea..eb4624c8 100644 --- a/build/buildtools/commondefs.firm +++ b/build/buildtools/commondefs.firm @@ -38,7 +38,7 @@ override TWL_MEMSIZE := 16M # TWL-FIRM path settings # -FIRM_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWLIPL_ROOT))) +FIRM_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT))) FIRM_BUILDTOOLSDIR := $(FIRM_ROOT)/build/buildtools FIRM_BUILDSETUPDIR := $(FIRM_ROOT)/build/buildsetup FIRM_INCDIR := $(FIRM_ROOT)/include @@ -132,7 +132,7 @@ GLIBRARIES := $(FIRM_LIBS) $(GLIBRARIES) ifdef TWLFIRM_INSTALL_ROOT TWLFIRM_INSTALL_ROOT_ := $(TWLFIRM_INSTALL_ROOT) else -TWLFIRM_INSTALL_ROOT_ := $(TWLIPL_ROOT) +TWLFIRM_INSTALL_ROOT_ := $(TWL_IPL_RED_ROOT) endif FIRM_INSTALL_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWLFIRM_INSTALL_ROOT_))) diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index 85c04610..5b8f576d 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -27,7 +27,7 @@ SPACE ?= $(EMPTY) $(EMPTY) # TWL-SYSTEM-MENU path settings # -SYSMENU_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWLIPL_ROOT))) +SYSMENU_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT))) SYSMENU_BUILDTOOLSDIR := $(SYSMENU_ROOT)/build/buildtools SYSMENU_INCDIR := $(SYSMENU_ROOT)/include \ $(TWLSDK_ROOT)/build/libraries/spi/arm9/include \ diff --git a/build/buildtools/modulerules b/build/buildtools/modulerules index e6a51890..3d246a4a 100644 --- a/build/buildtools/modulerules +++ b/build/buildtools/modulerules @@ -22,9 +22,9 @@ ifndef TWL_IPL_MODULERULES_ # ifeq ($(TARGET_FIRM),SYSTEMMENU) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules.sysmenu else -include $(TWLIPL_ROOT)/build/buildtools/modulerules.firm +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules.firm endif diff --git a/build/buildtools/modulerules.firm b/build/buildtools/modulerules.firm index 66815793..d0c0634d 100644 --- a/build/buildtools/modulerules.firm +++ b/build/buildtools/modulerules.firm @@ -46,10 +46,10 @@ FIRM_SDEPENDS_BIN = $(MAKEFIRM_RSA_PRVKEY) $(MAKEFIRM_ARM9) $(MAKEFIRM_ARM7) .PHONY: firmtop firmlib firmtop: - @$(MAKE) -C $(TWLIPL_ROOT)/build + @$(MAKE) -C $(TWL_IPL_RED_ROOT)/build firmlib: - @$(MAKE) -C $(TWLIPL_ROOT)/build/libraries + @$(MAKE) -C $(TWL_IPL_RED_ROOT)/build/libraries # .nor $(BINDIR)/%.nor: $(FIRM_SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENORFIRM) diff --git a/build/components/Makefile b/build/components/Makefile index 18a87efd..466e4fce 100644 --- a/build/components/Makefile +++ b/build/components/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile index 5c09bdee..3182d5ff 100644 --- a/build/components/hyena.TWL/Makefile +++ b/build/components/hyena.TWL/Makefile @@ -37,7 +37,7 @@ LDRES_TEMPLATE = $(TWLSDK_ROOT)/build/components/racoon.TWL/racoon.response.temp CRT0_O = crt0.LTD.TWL.o #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot ifdef TWLSDK_NOCRYPTO @@ -77,6 +77,6 @@ LDEPENDS_NEF = $(TWL_LIBS) $(LLIBRARIES) do-build: $(TARGETS) #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c index fb65629d..12994a88 100644 --- a/build/components/hyena.TWL/src/main.c +++ b/build/components/hyena.TWL/src/main.c @@ -148,7 +148,9 @@ TwlSpMain(void) if (OS_IsRunOnTwl() == TRUE) { + OSTick start = OS_GetTick(); InitializeFatfs(); // FATFS 初期化 + OS_TPrintf( "FATFS init time = %dms\n", OS_TicksToMilliSeconds( OS_GetTick() - start ) ); InitializeNwm(); // NWM 初期化 #ifndef SDK_NOCRYPTO AES_Init(); // AES 初期化 @@ -288,15 +290,7 @@ PrintDebugInfo(void) { OS_TPrintf("ARM7: This component is running on NITRO.\n"); } -#ifdef SDK_TWLLTD - OS_TPrintf("ARM7: This component is \"racoon.TWL\"\n"); -#else /* SDK_TWLHYB */ -#ifdef SDK_WIRELESS_IN_VRAM - OS_TPrintf("ARM7: This component is \"ichneumon.TWL\"\n"); -#else - OS_TPrintf("ARM7: This component is \"mongoose.TWL\"\n"); -#endif -#endif + OS_TPrintf("ARM7: This component is \"hyena.TWL\"\n"); } #include diff --git a/build/libraries/Makefile b/build/libraries/Makefile index 1c268a4e..fbea45f3 100644 --- a/build/libraries/Makefile +++ b/build/libraries/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -34,7 +34,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/aes/ARM7/Makefile b/build/libraries/aes/ARM7/Makefile index 50e61849..e407dbee 100644 --- a/build/libraries/aes/ARM7/Makefile +++ b/build/libraries/aes/ARM7/Makefile @@ -38,7 +38,7 @@ TARGET_LIB = libaes_sp$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -48,6 +48,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/aes/ARM9/Makefile b/build/libraries/aes/ARM9/Makefile index b4fb50b4..822f216d 100644 --- a/build/libraries/aes/ARM9/Makefile +++ b/build/libraries/aes/ARM9/Makefile @@ -12,8 +12,8 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- SUBDIRS = @@ -34,7 +34,7 @@ TARGET_LIB = libaes$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -44,6 +44,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/aes/Makefile b/build/libraries/aes/Makefile index 4e392b52..bf4c4446 100644 --- a/build/libraries/aes/Makefile +++ b/build/libraries/aes/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM9 ARM7 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/fatfs/ARM7/Makefile b/build/libraries/fatfs/ARM7/Makefile index 642bcefd..3654b315 100644 --- a/build/libraries/fatfs/ARM7/Makefile +++ b/build/libraries/fatfs/ARM7/Makefile @@ -43,7 +43,7 @@ TARGET_LIB = libfatfs_sp$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -53,6 +53,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/fatfs/ARM9/Makefile b/build/libraries/fatfs/ARM9/Makefile index 84f08dcc..c1c9e673 100644 --- a/build/libraries/fatfs/ARM9/Makefile +++ b/build/libraries/fatfs/ARM9/Makefile @@ -28,7 +28,7 @@ TARGET_LIB = libfatfs$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -37,6 +37,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/fatfs/Makefile b/build/libraries/fatfs/Makefile index 15843bbb..d53f54db 100644 --- a/build/libraries/fatfs/Makefile +++ b/build/libraries/fatfs/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM9 ARM7 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/fs/ARM7/Makefile b/build/libraries/fs/ARM7/Makefile index 9daefcf9..20ee3676 100644 --- a/build/libraries/fs/ARM7/Makefile +++ b/build/libraries/fs/ARM7/Makefile @@ -12,8 +12,8 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- SUBDIRS = @@ -39,7 +39,7 @@ TARGET_LIB = libfs_sp$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -49,6 +49,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/fs/ARM9/Makefile b/build/libraries/fs/ARM9/Makefile index 9f9a5053..19d54909 100644 --- a/build/libraries/fs/ARM9/Makefile +++ b/build/libraries/fs/ARM9/Makefile @@ -12,8 +12,8 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- SUBDIRS = @@ -31,7 +31,7 @@ TARGET_LIB = libfs$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/add-ins/es/commondefs.es INSTALL_TARGETS = $(TARGETS) @@ -42,6 +42,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/fs/Makefile b/build/libraries/fs/Makefile index 2be9fed3..94c7f98c 100644 --- a/build/libraries/fs/Makefile +++ b/build/libraries/fs/Makefile @@ -16,7 +16,7 @@ # $Author$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM9 ARM7 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/gcd/ARM7/Makefile b/build/libraries/gcd/ARM7/Makefile index cb8f2b75..a9879b0e 100644 --- a/build/libraries/gcd/ARM7/Makefile +++ b/build/libraries/gcd/ARM7/Makefile @@ -38,7 +38,7 @@ INCDIR = ../include #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -47,6 +47,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/gcd/ARM9/Makefile b/build/libraries/gcd/ARM9/Makefile index b815a1f4..d1d747c1 100644 --- a/build/libraries/gcd/ARM9/Makefile +++ b/build/libraries/gcd/ARM9/Makefile @@ -38,7 +38,7 @@ INCDIR = ../include #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -47,7 +47,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules LDEPENDS_OBJ := $(MAKEFIRM_RSA_PUBKEY) \ diff --git a/build/libraries/gcd/Makefile b/build/libraries/gcd/Makefile index 9bd0918d..bae95ea7 100644 --- a/build/libraries/gcd/Makefile +++ b/build/libraries/gcd/Makefile @@ -15,7 +15,7 @@ # $NoKeywords: $ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -28,7 +28,7 @@ SUBDIRS += ARM7 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/init/ARM7/Makefile b/build/libraries/init/ARM7/Makefile index 839a13cc..9070af64 100644 --- a/build/libraries/init/ARM7/Makefile +++ b/build/libraries/init/ARM7/Makefile @@ -32,7 +32,7 @@ TARGET_OBJ = crt0_firm.o #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -42,7 +42,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/init/ARM9/Makefile b/build/libraries/init/ARM9/Makefile index e76af963..ccf9506f 100644 --- a/build/libraries/init/ARM9/Makefile +++ b/build/libraries/init/ARM9/Makefile @@ -28,7 +28,7 @@ TARGET_OBJ = crt0_firm.o #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -38,7 +38,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/init/Makefile b/build/libraries/init/Makefile index ce0d6f51..18137ffb 100644 --- a/build/libraries/init/Makefile +++ b/build/libraries/init/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ SUBDIRS = ARM9 \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/mi/ARM9/Makefile b/build/libraries/mi/ARM9/Makefile index cb83e1e6..ba3a2df4 100644 --- a/build/libraries/mi/ARM9/Makefile +++ b/build/libraries/mi/ARM9/Makefile @@ -34,7 +34,7 @@ SRCS = \ TARGET_LIB = libmi$(FIRM_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -43,6 +43,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/mi/Makefile b/build/libraries/mi/Makefile index 54d99b0c..a439cbf6 100644 --- a/build/libraries/mi/Makefile +++ b/build/libraries/mi/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM9 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/os/ARM7/Makefile b/build/libraries/os/ARM7/Makefile index cd454cde..40728093 100644 --- a/build/libraries/os/ARM7/Makefile +++ b/build/libraries/os/ARM7/Makefile @@ -37,7 +37,7 @@ TARGET_LIB = libos_sp$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -47,7 +47,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/os/ARM9/Makefile b/build/libraries/os/ARM9/Makefile index 63022113..eeb8c37c 100644 --- a/build/libraries/os/ARM9/Makefile +++ b/build/libraries/os/ARM9/Makefile @@ -33,7 +33,7 @@ SRCS = \ TARGET_LIB = libos$(FIRM_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -42,6 +42,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/os/Makefile b/build/libraries/os/Makefile index a61613f1..a2045b3d 100644 --- a/build/libraries/os/Makefile +++ b/build/libraries/os/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ SUBDIRS = ARM9 \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pm/ARM7/Makefile b/build/libraries/pm/ARM7/Makefile index 14b4bc64..45b00945 100644 --- a/build/libraries/pm/ARM7/Makefile +++ b/build/libraries/pm/ARM7/Makefile @@ -40,7 +40,7 @@ TARGET_LIB = libpm_sp$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -50,6 +50,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pm/Makefile b/build/libraries/pm/Makefile index 4d2df08f..f9636f04 100644 --- a/build/libraries/pm/Makefile +++ b/build/libraries/pm/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM7 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pxi/ARM7/Makefile b/build/libraries/pxi/ARM7/Makefile index cd107800..ce2d85a8 100644 --- a/build/libraries/pxi/ARM7/Makefile +++ b/build/libraries/pxi/ARM7/Makefile @@ -36,7 +36,7 @@ TARGET_LIB = libpxi_sp$(FIRM_LIBSUFFIX).a #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -46,7 +46,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pxi/ARM9/Makefile b/build/libraries/pxi/ARM9/Makefile index fb0a7b0e..3e8d0580 100644 --- a/build/libraries/pxi/ARM9/Makefile +++ b/build/libraries/pxi/ARM9/Makefile @@ -32,7 +32,7 @@ SRCS = \ TARGET_LIB = libpxi$(FIRM_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -41,6 +41,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pxi/Makefile b/build/libraries/pxi/Makefile index 8410a70a..2dbcba07 100644 --- a/build/libraries/pxi/Makefile +++ b/build/libraries/pxi/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ SUBDIRS = ARM9 \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/Makefile b/build/libraries_sysmenu/Makefile index ab047925..d005f516 100644 --- a/build/libraries_sysmenu/Makefile +++ b/build/libraries_sysmenu/Makefile @@ -18,7 +18,7 @@ TARGET_FIRM = SYSTEMMENU -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ SUBDIRS = sysmenu settings mb_loader acsign boot hotsw reset_param #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/acsign/ARM9/Makefile b/build/libraries_sysmenu/acsign/ARM9/Makefile index 81a76cb6..e15dfe26 100644 --- a/build/libraries_sysmenu/acsign/ARM9/Makefile +++ b/build/libraries_sysmenu/acsign/ARM9/Makefile @@ -37,7 +37,7 @@ SRCS = acsign.c acmemory.c acsign_util.c \ TARGET_LIB = libacsign$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -53,7 +53,7 @@ CCFLAGS += -DSMALL_CODE_SIZE \ do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/acsign/Makefile b/build/libraries_sysmenu/acsign/Makefile index 665c3ecd..66c26aae 100644 --- a/build/libraries_sysmenu/acsign/Makefile +++ b/build/libraries_sysmenu/acsign/Makefile @@ -20,12 +20,12 @@ SUBDIRS = ARM9 TARGET_FIRM = SYSTEMMENU -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/boot/ARM7/Makefile b/build/libraries_sysmenu/boot/ARM7/Makefile index c184bce9..ce1c3afe 100644 --- a/build/libraries_sysmenu/boot/ARM7/Makefile +++ b/build/libraries_sysmenu/boot/ARM7/Makefile @@ -35,7 +35,7 @@ SRCS = bootAPI.c boot.c TARGET_LIB = libboot_sp$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot INSTALL_TARGETS = $(TARGETS) @@ -45,7 +45,7 @@ INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/boot/ARM9/Makefile b/build/libraries_sysmenu/boot/ARM9/Makefile index f55bab56..75d52ff3 100644 --- a/build/libraries_sysmenu/boot/ARM9/Makefile +++ b/build/libraries_sysmenu/boot/ARM9/Makefile @@ -35,7 +35,7 @@ SRCS = boot.c bootAPI.c TARGET_LIB = libboot$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot INSTALL_TARGETS = $(TARGETS) @@ -45,7 +45,7 @@ INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/boot/Makefile b/build/libraries_sysmenu/boot/Makefile index 6024cf88..1e0ca3f0 100644 --- a/build/libraries_sysmenu/boot/Makefile +++ b/build/libraries_sysmenu/boot/Makefile @@ -19,12 +19,12 @@ TARGET_FIRM = SYSTEMMENU SUBDIRS = ARM7 ARM9 -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/hotsw/ARM7/Makefile b/build/libraries_sysmenu/hotsw/ARM7/Makefile index 77291c13..1935bdf9 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/Makefile +++ b/build/libraries_sysmenu/hotsw/ARM7/Makefile @@ -34,7 +34,7 @@ SRCS = blowfish.c hotsw.c ds_blowfish_table.c dsCardType1.c dsCardType2.c TARGET_LIB = libcardboot_sp$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -43,7 +43,7 @@ INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/hotsw/Makefile b/build/libraries_sysmenu/hotsw/Makefile index 2c6fe1f8..be29adfd 100644 --- a/build/libraries_sysmenu/hotsw/Makefile +++ b/build/libraries_sysmenu/hotsw/Makefile @@ -18,7 +18,7 @@ TARGET_FIRM = SYSTEMMENU -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs @@ -28,7 +28,7 @@ SUBDIRS = ARM7 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/mb_loader/ARM7/Makefile b/build/libraries_sysmenu/mb_loader/ARM7/Makefile index c678ae77..09ec7f0c 100644 --- a/build/libraries_sysmenu/mb_loader/ARM7/Makefile +++ b/build/libraries_sysmenu/mb_loader/ARM7/Makefile @@ -37,7 +37,7 @@ SRCS = mb_loader.c TARGET_LIB = libmbloader_sp$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -46,7 +46,7 @@ INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/mb_loader/ARM9/Makefile b/build/libraries_sysmenu/mb_loader/ARM9/Makefile index 257cddcd..b8fa6b02 100644 --- a/build/libraries_sysmenu/mb_loader/ARM9/Makefile +++ b/build/libraries_sysmenu/mb_loader/ARM9/Makefile @@ -36,7 +36,7 @@ SRCS = mb_loader.c TARGET_LIB = libmbloader$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -45,7 +45,7 @@ INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/mb_loader/Makefile b/build/libraries_sysmenu/mb_loader/Makefile index 6024cf88..1e0ca3f0 100644 --- a/build/libraries_sysmenu/mb_loader/Makefile +++ b/build/libraries_sysmenu/mb_loader/Makefile @@ -19,12 +19,12 @@ TARGET_FIRM = SYSTEMMENU SUBDIRS = ARM7 ARM9 -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/reset_param/ARM9/Makefile b/build/libraries_sysmenu/reset_param/ARM9/Makefile index a012c4f5..883cbf0e 100644 --- a/build/libraries_sysmenu/reset_param/ARM9/Makefile +++ b/build/libraries_sysmenu/reset_param/ARM9/Makefile @@ -33,7 +33,7 @@ SRCS = reset_param.c TARGET_LIB = libreset_param$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -42,7 +42,7 @@ INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/reset_param/Makefile b/build/libraries_sysmenu/reset_param/Makefile index 95886bce..c4ee65f7 100644 --- a/build/libraries_sysmenu/reset_param/Makefile +++ b/build/libraries_sysmenu/reset_param/Makefile @@ -19,12 +19,12 @@ TARGET_FIRM = SYSTEMMENU SUBDIRS = ARM9 -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/settings/ARM9/Makefile b/build/libraries_sysmenu/settings/ARM9/Makefile index 7ececd08..40f3a80c 100644 --- a/build/libraries_sysmenu/settings/ARM9/Makefile +++ b/build/libraries_sysmenu/settings/ARM9/Makefile @@ -31,7 +31,7 @@ SRCS = NTRSettings.c TWLSettings.c \ TARGET_LIB = libsettings$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -42,7 +42,7 @@ LINCLUDES = $(TWLSDK_ROOT)/build/libraries/spi/ARM9/include \ do-build: $(MYSUBDIRS) $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules $(MYSUBDIRS):: diff --git a/build/libraries_sysmenu/settings/ARM9/src/TWLHWInfo.c b/build/libraries_sysmenu/settings/ARM9/src/TWLHWInfo.c index b6c064b0..e7b1edec 100644 --- a/build/libraries_sysmenu/settings/ARM9/src/TWLHWInfo.c +++ b/build/libraries_sysmenu/settings/ARM9/src/TWLHWInfo.c @@ -86,14 +86,14 @@ static const TSFParam s_secureParam = { // セキュア情報　公開鍵 static const u8 s_publicKey[ RSA_KEY_LENGTH ] = { - 0xc0, 0xe0, 0x88, 0x61, 0xc2, 0xc7, 0x0c, 0xef, 0x3c, 0xe5, 0x4e, 0xe4, 0x36, 0xce, 0xb4, 0x6f, - 0x77, 0xde, 0xb0, 0x44, 0xc4, 0x60, 0xd6, 0x28, 0xcf, 0xa1, 0xf4, 0xc3, 0xce, 0x5f, 0xd5, 0x1f, - 0xc2, 0x96, 0x6f, 0x54, 0x62, 0x60, 0x76, 0x34, 0x18, 0xbe, 0xff, 0xaa, 0xd8, 0x09, 0xea, 0x63, - 0x95, 0xf7, 0xdb, 0xc5, 0x8f, 0x59, 0xb8, 0xac, 0x13, 0x84, 0xe3, 0x1c, 0x43, 0xb6, 0xf7, 0x4d, - 0xd1, 0x91, 0xaf, 0x99, 0xf4, 0xef, 0xc3, 0x98, 0xb0, 0xcc, 0x39, 0xc8, 0x67, 0xf3, 0x83, 0x39, - 0x30, 0x78, 0x98, 0x15, 0x72, 0x4a, 0xc0, 0x61, 0xad, 0x2b, 0xf6, 0xf8, 0xbd, 0x6d, 0x78, 0x7a, - 0x84, 0xf3, 0x7b, 0x3d, 0x15, 0x26, 0xc3, 0xdb, 0x01, 0xa5, 0x2d, 0xbe, 0x2a, 0x68, 0xe6, 0xaf, - 0x6f, 0x11, 0xa5, 0xd7, 0x76, 0xaf, 0x3f, 0xce, 0x75, 0x95, 0x08, 0xb2, 0x37, 0xfb, 0x85, 0xc9, + 0xcf, 0x1a, 0xe0, 0xf7, 0xd1, 0x27, 0x59, 0xfb, 0x3a, 0x8c, 0xf5, 0x58, 0xc7, 0x17, 0xc1, 0xf2, + 0xa9, 0x77, 0xbd, 0x53, 0x59, 0xe4, 0xd3, 0x01, 0x27, 0xca, 0xb7, 0xc9, 0x92, 0x32, 0x2e, 0xb5, + 0xeb, 0x13, 0xbf, 0xca, 0xe2, 0x1b, 0xe7, 0x5c, 0xb0, 0x68, 0x5c, 0x58, 0x87, 0x84, 0x8c, 0x69, + 0xb2, 0x59, 0x6b, 0x89, 0xd7, 0xa1, 0x89, 0x4c, 0x46, 0x36, 0xd8, 0xbb, 0xbd, 0xc8, 0x9d, 0xf5, + 0xd2, 0x64, 0xb6, 0xeb, 0x71, 0x56, 0x2a, 0x69, 0xbd, 0x1d, 0xa3, 0xf6, 0xa1, 0x64, 0xe4, 0x8b, + 0xda, 0x9b, 0xd2, 0x67, 0x19, 0xb5, 0xf0, 0xe0, 0xbb, 0xe3, 0x2c, 0xa9, 0xb4, 0x5c, 0xfb, 0x2c, + 0x66, 0x61, 0xee, 0x18, 0x87, 0x23, 0x86, 0x34, 0xe7, 0xed, 0x1a, 0x75, 0x6e, 0x58, 0xb8, 0x81, + 0x61, 0x4e, 0x9d, 0x4f, 0x12, 0x44, 0x27, 0xf4, 0x16, 0x65, 0xa8, 0x9e, 0x0c, 0x18, 0x34, 0x43, }; diff --git a/build/libraries_sysmenu/settings/Makefile b/build/libraries_sysmenu/settings/Makefile index 52c5a13b..9f833282 100644 --- a/build/libraries_sysmenu/settings/Makefile +++ b/build/libraries_sysmenu/settings/Makefile @@ -18,7 +18,7 @@ TARGET_FIRM = SYSTEMMENU -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -27,7 +27,7 @@ SUBDIRS = ARM9 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/sysmenu/ARM9/Makefile b/build/libraries_sysmenu/sysmenu/ARM9/Makefile index e96569a7..8f33f688 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/Makefile +++ b/build/libraries_sysmenu/sysmenu/ARM9/Makefile @@ -32,7 +32,7 @@ SRCS = sysmenu_lib.c sysmenu_card.c sysmenu_util.c ninLogoFunc.c \ TARGET_LIB = libsysmenu$(TWL_LIBSUFFIX).a include $(TWLSDK_ROOT)/add-ins/es/commondefs.es -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -45,7 +45,7 @@ LINCLUDES = $(TWLSDK_ROOT)/build/libraries/mb/common/include \ do-build: $(MYSUBDIRS) $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules $(MYSUBDIRS):: diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c b/build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c index a664b069..3b7931f9 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/mountInfo.c @@ -52,7 +52,7 @@ static void SYSMi_SetMountInfoCore( const OSMountInfo *pSrc ); OSMountInfo s_defaultMountList[ DEFAULT_MOUNT_LIST_NUM ] ATTRIBUTE_ALIGN(4) = { // drive device target pertitionIdx resource userPermission rsvA B archive path { 'A', OS_MOUNT_DEVICE_SD, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_MMEM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "sdmc", "/" }, -// { 'F', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R), 0, 0, "nand", "/" }, // ユーザーはこのアーカイブではWrite不可 +// { 'B', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R), 0, 0, "nand", "/" }, // ユーザーはこのアーカイブではWrite不可 // { 'C', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 1, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R), 0, 0, "nand2", "/" }, // ユーザーはこのアーカイブではWrite不可 { 'F', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 0, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand", "/" }, // ユーザーはこのアーカイブではWrite不可 { 'C', OS_MOUNT_DEVICE_NAND, OS_MOUNT_TGT_ROOT, 1, OS_MOUNT_RSC_WRAM, (OS_MOUNT_USR_R|OS_MOUNT_USR_W), 0, 0, "nand2", "/" }, // ユーザーはこのアーカイブではWrite不可 diff --git a/build/libraries_sysmenu/sysmenu/Makefile b/build/libraries_sysmenu/sysmenu/Makefile index 52c5a13b..9f833282 100644 --- a/build/libraries_sysmenu/sysmenu/Makefile +++ b/build/libraries_sysmenu/sysmenu/Makefile @@ -18,7 +18,7 @@ TARGET_FIRM = SYSTEMMENU -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -27,7 +27,7 @@ SUBDIRS = ARM9 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/Makefile b/build/nandfirm/Makefile index d90ccf19..ef31ddd5 100644 --- a/build/nandfirm/Makefile +++ b/build/nandfirm/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -28,7 +28,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/menu-launcher/ARM7/Makefile b/build/nandfirm/menu-launcher/ARM7/Makefile index c2b25031..00370dea 100644 --- a/build/nandfirm/menu-launcher/ARM7/Makefile +++ b/build/nandfirm/menu-launcher/ARM7/Makefile @@ -35,7 +35,7 @@ CRT0_O = crt0_firm.o #SRCDIR = # using default #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs LLIBRARIES += libaes_sp$(TWL_LIBSUFFIX).a @@ -46,6 +46,6 @@ MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037c0000' do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/menu-launcher/ARM9/Makefile b/build/nandfirm/menu-launcher/ARM9/Makefile index 10376bb6..df848158 100644 --- a/build/nandfirm/menu-launcher/ARM9/Makefile +++ b/build/nandfirm/menu-launcher/ARM9/Makefile @@ -37,7 +37,7 @@ MAKEROM_ARM7_BASE = $(basename $(MAKEROM_ARM7)) #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs # no thumb version @@ -49,7 +49,7 @@ LLIBRARIES += libese.TWL$(ARCHGEN_TYPE).a do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/menu-launcher/Makefile b/build/nandfirm/menu-launcher/Makefile index 9eb31024..57e569f8 100644 --- a/build/nandfirm/menu-launcher/Makefile +++ b/build/nandfirm/menu-launcher/Makefile @@ -41,12 +41,12 @@ FIRM_SPEC = nandfirm.nandsf LDIRT_CLEAN += $(TARGETS) \ rsa_public.sbin \ -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/menu-launcher/wram_regs/Makefile b/build/nandfirm/menu-launcher/wram_regs/Makefile index dcfb4c4f..66504d9a 100644 --- a/build/nandfirm/menu-launcher/wram_regs/Makefile +++ b/build/nandfirm/menu-launcher/wram_regs/Makefile @@ -40,7 +40,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -51,7 +51,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/nandfirm-print/Makefile b/build/nandfirm/nandfirm-print/Makefile index 3f698393..81ff17bf 100644 --- a/build/nandfirm/nandfirm-print/Makefile +++ b/build/nandfirm/nandfirm-print/Makefile @@ -34,13 +34,13 @@ FIRM_SPEC = nandfirm-BB.nandsf LDIRT_CLEAN += $(TARGETS) \ rsa_public.sbin \ -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/sdmc-launcher/ARM7/Makefile b/build/nandfirm/sdmc-launcher/ARM7/Makefile index b45da841..e087303c 100644 --- a/build/nandfirm/sdmc-launcher/ARM7/Makefile +++ b/build/nandfirm/sdmc-launcher/ARM7/Makefile @@ -35,7 +35,7 @@ CRT0_O = crt0_firm.o #SRCDIR = # using default #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs LLIBRARIES += libaes_sp$(TWL_LIBSUFFIX).a @@ -46,6 +46,6 @@ MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037c0000' do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/sdmc-launcher/ARM9/Makefile b/build/nandfirm/sdmc-launcher/ARM9/Makefile index e5c6aa8a..1c0bbd29 100644 --- a/build/nandfirm/sdmc-launcher/ARM9/Makefile +++ b/build/nandfirm/sdmc-launcher/ARM9/Makefile @@ -37,7 +37,7 @@ MAKEROM_ARM7_BASE = $(basename $(MAKEROM_ARM7)) #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ include $(TWLIPL_ROOT)/build/buildtools/commondefs do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/sdmc-launcher/Makefile b/build/nandfirm/sdmc-launcher/Makefile index e3b89b0f..cc25c92d 100644 --- a/build/nandfirm/sdmc-launcher/Makefile +++ b/build/nandfirm/sdmc-launcher/Makefile @@ -41,12 +41,12 @@ FIRM_SPEC = nandfirm.nandsf LDIRT_CLEAN += $(TARGETS) \ rsa_public.sbin \ -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/sdmc-launcher/wram_regs/Makefile b/build/nandfirm/sdmc-launcher/wram_regs/Makefile index 59ae8957..a9bc2f39 100644 --- a/build/nandfirm/sdmc-launcher/wram_regs/Makefile +++ b/build/nandfirm/sdmc-launcher/wram_regs/Makefile @@ -40,7 +40,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -51,7 +51,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/Makefile b/build/norfirm/Makefile index 1501817e..d118dd75 100644 --- a/build/norfirm/Makefile +++ b/build/norfirm/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -28,7 +28,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile index 254823c5..c518dda7 100644 --- a/build/norfirm/norfirm-empty/Makefile +++ b/build/norfirm/norfirm-empty/Makefile @@ -39,12 +39,12 @@ FIRM_SPEC = norfirm-BB.norsf LDIRT_CLEAN += $(TARGETS) \ rsa_public.sbin \ -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-print/ARM7/Makefile b/build/norfirm/norfirm-print/ARM7/Makefile index 405ff7f5..53b0578c 100644 --- a/build/norfirm/norfirm-print/ARM7/Makefile +++ b/build/norfirm/norfirm-print/ARM7/Makefile @@ -36,14 +36,14 @@ SRCS = \ MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037c0000' -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-print/ARM9/Makefile b/build/norfirm/norfirm-print/ARM9/Makefile index 9139e3a6..6f5d8a9f 100644 --- a/build/norfirm/norfirm-print/ARM9/Makefile +++ b/build/norfirm/norfirm-print/ARM9/Makefile @@ -35,14 +35,14 @@ MAKEROM_ARM7_BASE = $(basename $(MAKEROM_ARM7)) #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile index d28f8122..be7f9209 100644 --- a/build/norfirm/norfirm-print/Makefile +++ b/build/norfirm/norfirm-print/Makefile @@ -41,13 +41,13 @@ FIRM_SPEC = norfirm-BB.norsf LDIRT_CLEAN += $(TARGETS) \ rsa_public.sbin \ -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-print/wram_regs/Makefile b/build/norfirm/norfirm-print/wram_regs/Makefile index bc94ae79..427c35a2 100644 --- a/build/norfirm/norfirm-print/wram_regs/Makefile +++ b/build/norfirm/norfirm-print/wram_regs/Makefile @@ -40,7 +40,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -51,7 +51,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile b/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile index bd252c88..f0cf9a5d 100644 --- a/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile +++ b/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile @@ -38,14 +38,14 @@ LLIBRARY_DIRS = LLIBRARIES = LDEPENDS_NEF = -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build : $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/DS_DownloadPlay/banner/Makefile b/build/systemMenu_RED/DS_DownloadPlay/banner/Makefile index dc0c5219..ea261271 100644 --- a/build/systemMenu_RED/DS_DownloadPlay/banner/Makefile +++ b/build/systemMenu_RED/DS_DownloadPlay/banner/Makefile @@ -16,7 +16,7 @@ # $Author: kitase_hirotake $ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs ICON_DIR = ./icon @@ -35,7 +35,7 @@ LDIRT_CLEAN = $(TARGETS) \ $(BANNER_ICON_NAME).nbfp \ $(TARGETS:.bnr=.srl) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- # build diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile index 4c1f3da5..d196db2a 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile @@ -41,7 +41,7 @@ LINCLUDES = $(MISC_DIR)/include MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs LDIRT_CLEAN = $(TARGET_TAD) @@ -53,7 +53,7 @@ INSTALL_DIR = $(SDK_NMENU_DATADIR) do-build : $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/HWInfoWriter/banner/Makefile b/build/systemMenu_RED/HWInfoWriter/banner/Makefile index 50edbbb8..27b48038 100644 --- a/build/systemMenu_RED/HWInfoWriter/banner/Makefile +++ b/build/systemMenu_RED/HWInfoWriter/banner/Makefile @@ -16,7 +16,7 @@ # $Author$ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs ICON_DIR = ./icon @@ -35,7 +35,7 @@ LDIRT_CLEAN = $(TARGETS) \ $(BANNER_ICON_NAME).nbfp \ $(TARGETS:.bnr=.srl) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- # build diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 21fa3d2a..c9ed0602 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -62,7 +62,7 @@ DEFAULT_COMP_ARM7 = hyena MAKEROM_FLAGS += -F -DTITLEID_LO='$(TITLEID_LO)' include $(TWLSDK_ROOT)/add-ins/es/commondefs.es -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot LDIRT_CLEAN = $(TARGET_TAD) @@ -74,7 +74,7 @@ INSTALL_DIR = $(SDK_NMENU_DATADIR) do-build : $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index 681fef9f..8a12589c 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -47,7 +47,7 @@ MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' LLIBRARIES += libreset_param$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs LDIRT_CLEAN = $(TARGET_TAD) @@ -58,7 +58,7 @@ INSTALL_DIR = $(SDK_NMENU_DATADIR) do-build : $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/MachineSettings/banner/Makefile b/build/systemMenu_RED/MachineSettings/banner/Makefile index dc0c5219..ea261271 100644 --- a/build/systemMenu_RED/MachineSettings/banner/Makefile +++ b/build/systemMenu_RED/MachineSettings/banner/Makefile @@ -16,7 +16,7 @@ # $Author: kitase_hirotake $ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs ICON_DIR = ./icon @@ -35,7 +35,7 @@ LDIRT_CLEAN = $(TARGETS) \ $(BANNER_ICON_NAME).nbfp \ $(TARGETS:.bnr=.srl) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- # build diff --git a/build/systemMenu_RED/PictoChat/ARM9/Makefile b/build/systemMenu_RED/PictoChat/ARM9/Makefile index c5c621a1..226a901a 100644 --- a/build/systemMenu_RED/PictoChat/ARM9/Makefile +++ b/build/systemMenu_RED/PictoChat/ARM9/Makefile @@ -40,7 +40,7 @@ LINCLUDES = $(MISC_DIR)/include MAKEROM_FLAGS += -DTITLEID_LO='$(TITLEID_LO)' -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs LDIRT_CLEAN = $(TARGET_TAD) @@ -52,7 +52,7 @@ INSTALL_DIR = $(SDK_NMENU_DATADIR) do-build : $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/PictoChat/banner/Makefile b/build/systemMenu_RED/PictoChat/banner/Makefile index dc0c5219..ea261271 100644 --- a/build/systemMenu_RED/PictoChat/banner/Makefile +++ b/build/systemMenu_RED/PictoChat/banner/Makefile @@ -16,7 +16,7 @@ # $Author: kitase_hirotake $ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs ICON_DIR = ./icon @@ -35,7 +35,7 @@ LDIRT_CLEAN = $(TARGETS) \ $(BANNER_ICON_NAME).nbfp \ $(TARGETS:.bnr=.srl) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- # build diff --git a/build/tools/acsign/Makefile b/build/tools/acsign/Makefile index bba2b4af..f349f416 100644 --- a/build/tools/acsign/Makefile +++ b/build/tools/acsign/Makefile @@ -37,7 +37,7 @@ SRCS = acsign.c acmemory.c acsign_util.c TARGET_LIB = libacsign_x86.a -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs # CCFLAGS += -DOPT_32_BIT -DSTANDALONE -DNO_SPLIT -DNO_FP_API -DNO_R_DIAG -DNO_STDIO_H -DNO_STDLIB_H CCFLAGS += -DSMALL_CODE_SIZE \ @@ -55,7 +55,7 @@ INSTALL_DIR = . do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/tools/makegcdfirm/Makefile b/build/tools/makegcdfirm/Makefile index 71581708..a46292ac 100644 --- a/build/tools/makegcdfirm/Makefile +++ b/build/tools/makegcdfirm/Makefile @@ -53,7 +53,7 @@ SRCDIR += ../acsign $(ECC_SRCDIR) INCDIR += ../acsign/include $(ECC_INCDIR) $(ECC_SRCDIR) -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs TARGETS = makegcdfirm.exe diff --git a/build/tools/makegcdfirm/test/Makefile b/build/tools/makegcdfirm/test/Makefile index 1f985ca0..2c2b4741 100644 --- a/build/tools/makegcdfirm/test/Makefile +++ b/build/tools/makegcdfirm/test/Makefile @@ -18,7 +18,7 @@ SUBDIRS = wram_rbin \ -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs MAKEGCDFIRM = ../makegcdfirm.exe diff --git a/build/tools/makegcdfirm/test/wram_rbin/Makefile b/build/tools/makegcdfirm/test/wram_rbin/Makefile index c9cd7ebb..926c9b05 100644 --- a/build/tools/makegcdfirm/test/wram_rbin/Makefile +++ b/build/tools/makegcdfirm/test/wram_rbin/Makefile @@ -31,7 +31,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/tools/makenandfirm/Makefile b/build/tools/makenandfirm/Makefile index 11436d9d..09832e39 100644 --- a/build/tools/makenandfirm/Makefile +++ b/build/tools/makenandfirm/Makefile @@ -53,7 +53,7 @@ SRCDIR += ../acsign $(ECC_SRCDIR) INCDIR += ../acsign/include $(ECC_INCDIR) $(ECC_SRCDIR) -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs TARGETS = makenandfirm.exe diff --git a/build/tools/makenandfirm/test/wram_rbin/Makefile b/build/tools/makenandfirm/test/wram_rbin/Makefile index 217e8b45..63e58e5b 100644 --- a/build/tools/makenandfirm/test/wram_rbin/Makefile +++ b/build/tools/makenandfirm/test/wram_rbin/Makefile @@ -31,7 +31,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/tools/makenorfirm/Makefile b/build/tools/makenorfirm/Makefile index 60b4ecd6..8f624c9e 100644 --- a/build/tools/makenorfirm/Makefile +++ b/build/tools/makenorfirm/Makefile @@ -53,7 +53,7 @@ SRCDIR += ../acsign $(ECC_SRCDIR) INCDIR += ../acsign/include $(ECC_INCDIR) $(ECC_SRCDIR) -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs TARGETS = makenorfirm.exe diff --git a/build/tools/makenorfirm/test/wram_rbin/Makefile b/build/tools/makenorfirm/test/wram_rbin/Makefile index f0ecbeda..8e7621d8 100644 --- a/build/tools/makenorfirm/test/wram_rbin/Makefile +++ b/build/tools/makenorfirm/test/wram_rbin/Makefile @@ -31,7 +31,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLIPL_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/keys/HWInfo/privKeyHWInfo.der b/keys/HWInfo/privKeyHWInfo.der index 73a7da7cd1adf6c69e85d6caded0c0d0bef112fe..fcb22911a33741fb9117b8ec41c3873657bbddf2 100644 GIT binary patch literal 609 zcmV-n0-pUaf&yIv0RRGlfdJ1M;P=rdS^GMS^;pLj!Sbnhy;E7_(*Y;Sx5<(+F170u zzslkp=UlL8Tv&&MjA^o2Yl+vPiA+W|*t@;Ro%PaWw(D_LDrvnPqxPX>{S zkD;sOAi$ewJwkjTWzOL`luNvUVt>15JslMHS7}X=@7s}jWXU~^uP^H@Tik2+JHfoz zPuH3VnfG#)loe<8ijMG{=55(E>pLo~er`GhwRRcL;^QR7yaFp6uH7 v-3ezSC5+Xn{~@{DKlAsrc_+~CtrD9n>(PS;1MzMP;gR$;u(~X?dx>G;8T}z} literal 607 zcmV-l0-*gcf&yCt0RRGlfdIhZh+)FV4DUSUPUJSuv~PFbutdaQ)+o=R^ux|y)gQu^ zZ&YGnb~G5i|Ekyt>SLAn+r^JrxU3U|;~Yb__f64}ubK4k!+qu?pdvd zFKP|t)XbYl#UwcMf`A9BF}v68-1rcDa@n6p5&Z!HKElKen^=R(sIw|U{ynB#)rV2N zI~yo~8j9NJy*#Y9gO352#%DCjpx$K8C%4o8GNC7q}h?-EH-U__Fbg| zvYZvj=TrNRq;;X1jD09@4FjdQ^VEp)n8RW`WZgYmR*ys~4+22|!~XTKK1rrgn)SK> zWU^ME^At(fDftkZ1AbJCK2T1O*diJ3Ecr z(g-YC#<=KB9c4GD>I0ZBjBhX~y`FECr?Ui)0ze++SchnCQjHXLiS@@9uUkT8g4rJeLPv6f-?Xn;P=rdS^GMS^;pLj!Sbnhy;E7_(*Y;Sx5<(+F170uzslkp z=UlL8Tv&&MjA^o2Yl+vPiA+W|*t@;Ro%PaWw(D_LDrvnPqxPX>!h+)FV4DUSUPUJSuv~PFbutdaQ)+o=R^ux|y)gQu^Z&YGn zb~G5i|Ekyt>SLAn+r^JrxU3U|;~Yb__f64}ubK4k!