ビルドの整理。TWL_KEYSDIRが定義されていない時は、systemMenu_RED関連のみをビルドするよう変更。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1982 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/Makefile

@@ -21,15 +21,21 @@ include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
-SUBDIRS =	\
+ifneq	($(TWL_KEYSDIR),)
-            tools \
+SUBDIRS =	tools
-            libraries \
+endif
-			libraries_sysmenu\
+
-			nandfirm \
+SUBDIRS +=	libraries_sysmenu \
 			components \
-			systemMenu_RED \
+			systemMenu_RED
-			systemMenu_tools \
+
+
+ifneq	($(TWL_KEYSDIR),)
+SUBDIRS +=	libraries \
+			nandfirm \
 			gcdfirm \
+			systemMenu_tools
+endif
 
 ifdef TWL_IPL_WITH_TESTS
 SUBDIRS +=	tests

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),)
+ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),)
-TWL_KEYSDIR	:= $(TWL_IPL_RED_ROOT)/keys/dummy
-else
 TWL_KEYSDIR	:= $(TWL_IPL_RED_PRIVATE_ROOT)/keys
 endif
 

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	?=
 
 #----------------------------------------------------------------------------

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
 #

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))