・環境変数TWL_KEYSDIRによる鍵フォルダの指定がない場合に、ダミー鍵で各ファームをビルドするよう変更。

・keys/dummy/rsa以下にダミー鍵を追加。

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

build/buildtools/commondefs

@@ -20,9 +20,16 @@ TWLFIRM_COMMONDEFS_ = TRUE
 
 NITRO_NO_STD_PCHDR = TRUE # プリコンパイルヘッダ抑止
 
-export TWLBROM_ROOT := $(TWLFIRM_ROOT)/bootrom
+ifndef TWL_KEYSDIR
+DUMMY_KEYS_SUFFIX	=	.dummykey
+endif
+TWL_KEYSDIR			?=	$(FIRM_ROOT)/keys/dummy
 
 
+ifneq ($(filter NORFIRM NANDFIRM GCDFIRM,$(FIRM_TARGET)),)
+TARGET_BIN			?=	$(TARGET_FIRM:.nor=$(DUMMY_KEYS_SUFFIX).nor)
+endif
+
 EMPTY	 	?=
 SPACE 		?= $(EMPTY) $(EMPTY)
 
@@ -93,14 +100,6 @@ TWL_BUILD_DIR	?= $(FIRM_BUILD_DIR)
 
 
 
-#----------------------------------------------------------------------------
-#  BROM-SDK path settings
-#
-
-BROM_ROOT			:= $(subst $(SPACE),\ ,$(subst \,/,$(TWLBROM_ROOT)))
-BROM_KEYSDIR		:= $(BROM_ROOT)/build/keys
-
-
 #----------------------------------------------------------------------------
 #  TWL-FIRM path settings
 #

build/norfirm/norfirm-empty/Makefile

@@ -22,12 +22,11 @@ FIRM_TARGET    = NORFIRM
 
 include	$(TWLFIRM_ROOT)/build/buildtools/commondefs
 
-
 #----------------------------------------------------------------------------
 
 SUBDIRS =	\
 
-TARGET_BIN		=	norfirm_empty.nor
+TARGET_FIRM		=	norfirm_empty.nor
 BINDIR			=	.
 MAKEFIRM_RSA_PRVKEY	= $(TWL_KEYSDIR)/rsa/private_nor.der
 
@@ -40,6 +39,9 @@ NITRO_MAKEROM	=	TRUE
 MAKEFIRM_FLAGS	+=	-p
 FIRM_SPEC		=	norfirm-BB.norsf
 
+LDIRT_CLEAN		+=	$(BINDIR)/$(TARGET_BIN) \
+					rsa_public.sbin \
+
 #----------------------------------------------------------------------------
 
 do-build:	$(TARGET_BIN)

build/norfirm/norfirm-print/Makefile

@@ -30,7 +30,7 @@ SUBDIRS =	\
             ARM9 \
             wram_regs \
 
-TARGET_BIN		=	norfirm_print.nor
+TARGET_FIRM		=	norfirm_print.nor
 BINDIR			=	.
 MAKEFIRM_ARM9	=	ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.axf
 MAKEFIRM_ARM7	=	ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.axf
@@ -41,6 +41,9 @@ NITRO_MAKEROM	=	TRUE
 MAKEFIRM_FLAGS	+=	-p
 FIRM_SPEC		=	norfirm-BB.norsf
 
+LDIRT_CLEAN		+=	$(BINDIR)/$(TARGET_BIN) \
+					rsa_public.sbin \
+
 #----------------------------------------------------------------------------
 
 do-build:	$(TARGET_BIN)