diff --git a/Makefile b/Makefile index 3a3d0afc..be8c7060 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = build #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/Makefile b/build/Makefile index c45dcc6b..a3f0a1e8 100644 --- a/build/Makefile +++ b/build/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,10 +26,12 @@ SUBDIRS = \ libraries \ nandfirm \ nand_formatter \ + libraries_sysmenu\ + systemmenu_RED #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/buildtools/modulerules.firm b/build/buildtools/modulerules.firm index 5ade6f8e..4ea316f6 100644 --- a/build/buildtools/modulerules.firm +++ b/build/buildtools/modulerules.firm @@ -50,10 +50,10 @@ SDEPENDS_BIN += $(MAKEFIRM_RSA_PRVKEY) .PHONY: firmtop firmlib firmtop: - @$(MAKE) -C $(TWLFIRM_ROOT)/build + @$(MAKE) -C $(TWLIPL_ROOT)/build firmlib: - @$(MAKE) -C $(TWLFIRM_ROOT)/build/libraries + @$(MAKE) -C $(TWLIPL_ROOT)/build/libraries # .nor $(BINDIR)/%.nor: $(SDEPENDS_BIN) $(FIRM_SPEC) $(LDEPENDS_BIN) $(EDEPENDS_BIN) $(MAKEFILE) $(MAKENORFIRM) diff --git a/build/libraries/Makefile b/build/libraries/Makefile index 17fe8ac4..43e0847f 100644 --- a/build/libraries/Makefile +++ b/build/libraries/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -38,7 +38,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/aes/ARM7/Makefile b/build/libraries/aes/ARM7/Makefile index b6475223..a19bb1de 100644 --- a/build/libraries/aes/ARM7/Makefile +++ b/build/libraries/aes/ARM7/Makefile @@ -45,7 +45,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -55,6 +55,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/aes/Makefile b/build/libraries/aes/Makefile index f45f5240..6f815013 100644 --- a/build/libraries/aes/Makefile +++ b/build/libraries/aes/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM7 #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/fatfs/ARM7/Makefile b/build/libraries/fatfs/ARM7/Makefile index 1780c302..16ea02f2 100644 --- a/build/libraries/fatfs/ARM7/Makefile +++ b/build/libraries/fatfs/ARM7/Makefile @@ -50,7 +50,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -60,6 +60,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/fatfs/Makefile b/build/libraries/fatfs/Makefile index 2f6bc992..a6aec456 100644 --- a/build/libraries/fatfs/Makefile +++ b/build/libraries/fatfs/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM7 #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/gcd/ARM7/Makefile b/build/libraries/gcd/ARM7/Makefile index c8ddf7f6..29f06b7a 100644 --- a/build/libraries/gcd/ARM7/Makefile +++ b/build/libraries/gcd/ARM7/Makefile @@ -46,7 +46,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -55,6 +55,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/gcd/ARM9/Makefile b/build/libraries/gcd/ARM9/Makefile index b5ff3faa..52cee619 100644 --- a/build/libraries/gcd/ARM9/Makefile +++ b/build/libraries/gcd/ARM9/Makefile @@ -46,7 +46,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -55,7 +55,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules LDEPENDS_OBJ := $(MAKEFIRM_RSA_PUBKEY) \ diff --git a/build/libraries/gcd/Makefile b/build/libraries/gcd/Makefile index b762dc2b..cd64988b 100644 --- a/build/libraries/gcd/Makefile +++ b/build/libraries/gcd/Makefile @@ -15,7 +15,7 @@ # $NoKeywords: $ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -28,7 +28,7 @@ SUBDIRS += ARM7 #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/init/ARM7/Makefile b/build/libraries/init/ARM7/Makefile index df9543a8..ae15c2bb 100644 --- a/build/libraries/init/ARM7/Makefile +++ b/build/libraries/init/ARM7/Makefile @@ -42,7 +42,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -52,7 +52,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/init/ARM9/Makefile b/build/libraries/init/ARM9/Makefile index 5d42ef88..7481707b 100644 --- a/build/libraries/init/ARM9/Makefile +++ b/build/libraries/init/ARM9/Makefile @@ -38,7 +38,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -48,7 +48,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/init/Makefile b/build/libraries/init/Makefile index 360784ad..ce0d6f51 100644 --- a/build/libraries/init/Makefile +++ b/build/libraries/init/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ SUBDIRS = ARM9 \ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/mi/ARM9/Makefile b/build/libraries/mi/ARM9/Makefile index ec4b5f0a..e8461f13 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -55,6 +55,6 @@ endif do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/mi/Makefile b/build/libraries/mi/Makefile index 23ec9a5a..54d99b0c 100644 --- a/build/libraries/mi/Makefile +++ b/build/libraries/mi/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM9 #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/os/ARM7/Makefile b/build/libraries/os/ARM7/Makefile index 62ab9efb..8ebb4500 100644 --- a/build/libraries/os/ARM7/Makefile +++ b/build/libraries/os/ARM7/Makefile @@ -46,7 +46,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -56,7 +56,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/os/ARM9/Makefile b/build/libraries/os/ARM9/Makefile index 24a68c79..2e551901 100644 --- a/build/libraries/os/ARM9/Makefile +++ b/build/libraries/os/ARM9/Makefile @@ -34,7 +34,7 @@ SRCS = \ TARGET_LIB = libos$(FIRM_LIBSUFFIX).a -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -55,6 +55,6 @@ endif do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/os/Makefile b/build/libraries/os/Makefile index 722c058d..a61613f1 100644 --- a/build/libraries/os/Makefile +++ b/build/libraries/os/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ SUBDIRS = ARM9 \ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pm/ARM7/Makefile b/build/libraries/pm/ARM7/Makefile index 03187580..124e3af3 100644 --- a/build/libraries/pm/ARM7/Makefile +++ b/build/libraries/pm/ARM7/Makefile @@ -47,7 +47,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -57,6 +57,6 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pm/Makefile b/build/libraries/pm/Makefile index e9849a40..4d2df08f 100644 --- a/build/libraries/pm/Makefile +++ b/build/libraries/pm/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ SUBDIRS = ARM7 #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pxi/ARM7/Makefile b/build/libraries/pxi/ARM7/Makefile index abd1828a..72fd9f68 100644 --- a/build/libraries/pxi/ARM7/Makefile +++ b/build/libraries/pxi/ARM7/Makefile @@ -45,7 +45,7 @@ ifdef NITRO_DEBUG NITRO_BUILD_TYPE = RELEASE endif -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -55,7 +55,7 @@ INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pxi/ARM9/Makefile b/build/libraries/pxi/ARM9/Makefile index 25bdcdf3..52fe444c 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(FIRM_INSTALL_LIBDIR) @@ -53,6 +53,6 @@ endif do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries/pxi/Makefile b/build/libraries/pxi/Makefile index 29d6aa7d..8410a70a 100644 --- a/build/libraries/pxi/Makefile +++ b/build/libraries/pxi/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ SUBDIRS = ARM9 \ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nand_formatter/Makefile b/build/nand_formatter/Makefile index 009e8a80..aa8f3c07 100644 --- a/build/nand_formatter/Makefile +++ b/build/nand_formatter/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -28,7 +28,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/Makefile b/build/nandfirm/Makefile index e8bc0dff..c74b7087 100644 --- a/build/nandfirm/Makefile +++ b/build/nandfirm/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -29,7 +29,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/menu-launcher/ARM7/Makefile b/build/nandfirm/menu-launcher/ARM7/Makefile index 811aff19..2513f59d 100644 --- a/build/nandfirm/menu-launcher/ARM7/Makefile +++ b/build/nandfirm/menu-launcher/ARM7/Makefile @@ -36,7 +36,7 @@ CRT0_O = crt0_firm.o #SRCDIR = # using default #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs LLIBRARIES = libaes_sp$(TWL_LIBSUFFIX).a @@ -45,7 +45,7 @@ LLIBRARIES = libaes_sp$(TWL_LIBSUFFIX).a do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/menu-launcher/ARM9/Makefile b/build/nandfirm/menu-launcher/ARM9/Makefile index 2298c891..c426b865 100644 --- a/build/nandfirm/menu-launcher/ARM9/Makefile +++ b/build/nandfirm/menu-launcher/ARM9/Makefile @@ -36,7 +36,7 @@ CRT0_O = crt0_firm.o #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -44,7 +44,7 @@ include $(TWLFIRM_ROOT)/build/buildtools/commondefs do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/menu-launcher/Makefile b/build/nandfirm/menu-launcher/Makefile index 34a4981b..b4674eb4 100644 --- a/build/nandfirm/menu-launcher/Makefile +++ b/build/nandfirm/menu-launcher/Makefile @@ -48,12 +48,12 @@ LDIRT_CLEAN += $(TARGETS) \ $(basename $(firstword $(TARGETS))).tlf \ rsa_public.sbin \ -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_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 3ca1913a..cb6c3051 100644 --- a/build/nandfirm/menu-launcher/wram_regs/Makefile +++ b/build/nandfirm/menu-launcher/wram_regs/Makefile @@ -31,7 +31,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/nandfirm-print/Makefile b/build/nandfirm/nandfirm-print/Makefile index 0b06a8ed..b92d2c11 100644 --- a/build/nandfirm/nandfirm-print/Makefile +++ b/build/nandfirm/nandfirm-print/Makefile @@ -38,13 +38,13 @@ FIRM_SPEC = nandfirm-BB.nandsf LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ rsa_public.sbin \ -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/sdmc-launcher/ARM7/Makefile b/build/nandfirm/sdmc-launcher/ARM7/Makefile index 8f787412..8a02e2df 100644 --- a/build/nandfirm/sdmc-launcher/ARM7/Makefile +++ b/build/nandfirm/sdmc-launcher/ARM7/Makefile @@ -36,7 +36,7 @@ CRT0_O = crt0_firm.o #SRCDIR = # using default #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs LLIBRARIES = libaes_sp$(TWL_LIBSUFFIX).a @@ -45,7 +45,7 @@ LLIBRARIES = libaes_sp$(TWL_LIBSUFFIX).a do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/sdmc-launcher/ARM9/Makefile b/build/nandfirm/sdmc-launcher/ARM9/Makefile index d25b7279..8e9e540e 100644 --- a/build/nandfirm/sdmc-launcher/ARM9/Makefile +++ b/build/nandfirm/sdmc-launcher/ARM9/Makefile @@ -36,7 +36,7 @@ CRT0_O = crt0_firm.o #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -44,7 +44,7 @@ include $(TWLFIRM_ROOT)/build/buildtools/commondefs do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/nandfirm/sdmc-launcher/Makefile b/build/nandfirm/sdmc-launcher/Makefile index 90750bcd..565f8a19 100644 --- a/build/nandfirm/sdmc-launcher/Makefile +++ b/build/nandfirm/sdmc-launcher/Makefile @@ -48,12 +48,12 @@ LDIRT_CLEAN += $(TARGETS) \ $(basename $(firstword $(TARGETS))).tlf \ rsa_public.sbin \ -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_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 3ca1913a..cb6c3051 100644 --- a/build/nandfirm/sdmc-launcher/wram_regs/Makefile +++ b/build/nandfirm/sdmc-launcher/wram_regs/Makefile @@ -31,7 +31,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/Makefile b/build/norfirm/Makefile index ba23790e..1501817e 100644 --- a/build/norfirm/Makefile +++ b/build/norfirm/Makefile @@ -16,7 +16,7 @@ # $Author:$ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -28,7 +28,7 @@ SUBDIRS = \ #---------------------------------------------------------------------------- -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile index a0edd671..32cfdec7 100644 --- a/build/norfirm/norfirm-empty/Makefile +++ b/build/norfirm/norfirm-empty/Makefile @@ -37,12 +37,12 @@ FIRM_SPEC = norfirm-BB.norsf LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ rsa_public.sbin \ -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-print/ARM7/Makefile b/build/norfirm/norfirm-print/ARM7/Makefile index 4894cd44..d00372ee 100644 --- a/build/norfirm/norfirm-print/ARM7/Makefile +++ b/build/norfirm/norfirm-print/ARM7/Makefile @@ -36,7 +36,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -44,7 +44,7 @@ include $(TWLFIRM_ROOT)/build/buildtools/commondefs do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-print/ARM9/Makefile b/build/norfirm/norfirm-print/ARM9/Makefile index b392ea12..503c9c1f 100644 --- a/build/norfirm/norfirm-print/ARM9/Makefile +++ b/build/norfirm/norfirm-print/ARM9/Makefile @@ -35,7 +35,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- @@ -43,7 +43,7 @@ include $(TWLFIRM_ROOT)/build/buildtools/commondefs do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile index 35daf4e7..0b6a16a7 100644 --- a/build/norfirm/norfirm-print/Makefile +++ b/build/norfirm/norfirm-print/Makefile @@ -48,13 +48,13 @@ LDIRT_CLEAN += $(TARGETS) \ $(basename $(firstword $(TARGETS))).tlf \ rsa_public.sbin \ -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_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 7c687c34..f0ecbeda 100644 --- a/build/norfirm/norfirm-print/wram_regs/Makefile +++ b/build/norfirm/norfirm-print/wram_regs/Makefile @@ -31,7 +31,7 @@ SRCS = \ #LCFILE = # using default -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/tools/acsign/Makefile b/build/tools/acsign/Makefile index e50c0959..bba2b4af 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_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 $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/tools/makegcdfirm/Makefile b/build/tools/makegcdfirm/Makefile index a2de1504..71581708 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs TARGETS = makegcdfirm.exe diff --git a/build/tools/makegcdfirm/test/Makefile b/build/tools/makegcdfirm/test/Makefile index b0173154..1f985ca0 100644 --- a/build/tools/makegcdfirm/test/Makefile +++ b/build/tools/makegcdfirm/test/Makefile @@ -18,7 +18,7 @@ SUBDIRS = wram_rbin \ -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_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 e1c3309d..c9cd7ebb 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/tools/makenandfirm/Makefile b/build/tools/makenandfirm/Makefile index 99071013..11436d9d 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_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 8be8394d..217e8b45 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/tools/makenorfirm/Makefile b/build/tools/makenorfirm/Makefile index 05d9365b..60b4ecd6 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_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 7c687c34..f0ecbeda 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 $(TWLFIRM_ROOT)/build/buildtools/commondefs +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_DIR = . INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) @@ -42,7 +42,7 @@ INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN) do-build: $(TARGETS) -include $(TWLFIRM_ROOT)/build/buildtools/modulerules +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/readme.txt b/readme.txt index 589a3b84..79bb1509 100644 --- a/readme.txt +++ b/readme.txt @@ -1,7 +1,13 @@ -ビルドするには NitroSDK4.0 & TwlSDK が必要です。 +1.ビルドに必要なもの +　NORファーム、NANDファーム + ・NitroSDK4.0以降 + ・TwlSDK +　システムメニュー +　　・TwlSDK +　　・NitroSystem 070314版(本ツリーのadd-ins内のTwlSDK対応パッチを当てたもの） -下記の環境変数を設定してください。 -例）TWLFIRM_ROOT=c:/TwlIPL -※NORファームをARM7専有WRAMへロードすることはできません -（ARM9でハッシュをチェックするため）。 +2.環境変数の設定 +　TWLIPL_ROOT + ex.) TWLIPL_ROOT=c:/TwlIPL + diff --git a/setup b/setup index daac39c1..55e7ae29 100644 --- a/setup +++ b/setup @@ -5,4 +5,4 @@ # Please use 'source ./setup'. #---------------------------------------------------------------- -export TWLFIRM_ROOT=`cygpath -m $PWD` +export TWLIPL_ROOT=`cygpath -m $PWD`