diff --git a/build/Makefile b/build/Makefile index ac5b127b..c06c0e2a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -21,15 +21,21 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -SUBDIRS = \ - tools \ - libraries \ - libraries_sysmenu\ - nandfirm \ +ifneq ($(TWL_KEYSDIR),) +SUBDIRS = tools +endif + +SUBDIRS += libraries_sysmenu \ components \ - systemMenu_RED \ - systemMenu_tools \ + systemMenu_RED + + +ifneq ($(TWL_KEYSDIR),) +SUBDIRS += libraries \ + nandfirm \ gcdfirm \ + systemMenu_tools +endif ifdef TWL_IPL_WITH_TESTS SUBDIRS += tests diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index aea88310..bbbb83cb 100644 --- a/build/buildtools/commondefs +++ b/build/buildtools/commondefs @@ -31,9 +31,7 @@ ifdef FIRM_USE_PRODUCT_KEYS MACRO_FLAGS += -DFIRM_USE_PRODUCT_KEYS=$(FIRM_USE_PRODUCT_KEYS) endif -ifeq ($(TWL_IPL_RED_PRIVATE_ROOT),) -TWL_KEYSDIR := $(TWL_IPL_RED_ROOT)/keys/dummy -else +ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) TWL_KEYSDIR := $(TWL_IPL_RED_PRIVATE_ROOT)/keys endif diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm index 14147dc7..7c782b6b 100644 --- a/build/buildtools/commondefs.firm +++ b/build/buildtools/commondefs.firm @@ -100,13 +100,9 @@ FIRM_LIBS ?= $(addsuffix $(FIRM_LIBSUFFIX).a,$(FIRM_LIBS_BASE)) MAKENORFIRM := $(FIRM_TOOLSDIR)/bin/makenorfirm.exe MAKENANDFIRM := $(FIRM_TOOLSDIR)/bin/makenandfirm.exe MAKEGCDFIRM := $(FIRM_TOOLSDIR)/bin/makegcdfirm.exe -OPENSSL := $(FIRM_TOOLSDIR)/openssl/openssl.exe NTEXCONV := $(ROOT)/tools/bin/ntexconv.exe MAKEBANNER := $(TWL_TOOLSDIR)/bin/makebanner.TWL.exe -MAKEFIRM_RSA_PRVKEY ?= $(FIRM_TOOLSDIR)/openssl/rsa_private.der -MAKEFIRM_RSA_PUBKEY ?= $(FIRM_TOOLSDIR)/openssl/rsa_public.der - MAKEFIRM_FLAGS ?= #---------------------------------------------------------------------------- diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index d9750c80..a8bfec50 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -23,8 +23,6 @@ NITRO_NO_STD_PCHDR = TRUE # EMPTY ?= SPACE ?= $(EMPTY) $(EMPTY) -TWL_KEYSDIR ?= $(SYSMENU_ROOT)/keys/dummy - #---------------------------------------------------------------------------- ### TWL-commondefs # diff --git a/build/buildtools/modulerules.firm b/build/buildtools/modulerules.firm index 2667d111..1014ed4d 100644 --- a/build/buildtools/modulerules.firm +++ b/build/buildtools/modulerules.firm @@ -57,7 +57,7 @@ else MAKEGCDFIRM_FLAGS += -t'$(FIRM_ROOT)/build/tools/makegcdfirm/gcdfirm_header_twlj.template.sbin' endif -FIRM_SDEPENDS_BIN := $(call eupath,$(MAKEFIRM_RSA_PRVKEY)) \ +FIRM_SDEPENDS_BIN := \ $(call eupath,$(MAKEFIRM_ARM9)) \ $(call eupath,$(MAKEFIRM_ARM7)) diff --git a/docs/リリース_SDK_5_0_RC/SDK_5_0_rc_ランチャーチェック表.xls b/docs/リリース_SDK_5_0_RC/SDK_5_0_rc_ランチャーチェック表.xls new file mode 100644 index 00000000..7ca9fab4 Binary files /dev/null and b/docs/リリース_SDK_5_0_RC/SDK_5_0_rc_ランチャーチェック表.xls differ diff --git a/docs/リリース_SDK_5_0_RC/TwlSDK 5.0 rc タスク.mmap b/docs/リリース_SDK_5_0_RC/TwlSDK 5.0 rc タスク.mmap new file mode 100644 index 00000000..c5a4fc58 Binary files /dev/null and b/docs/リリース_SDK_5_0_RC/TwlSDK 5.0 rc タスク.mmap differ