From 7dfc7b280f42475bcedc311b153d2c87723b5de1 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Thu, 6 Sep 2007 11:38:11 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0TW?= =?UTF-8?q?L=5FKEYSDIR=E3=81=AB=E3=82=88=E3=82=8B=E9=8D=B5=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=AB=E3=83=80=E3=81=AE=E6=8C=87=E5=AE=9A=E3=81=8C?= =?UTF-8?q?=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AB=E3=80=81=E3=83=80?= =?UTF-8?q?=E3=83=9F=E3=83=BC=E9=8D=B5=E3=81=A7=E5=90=84=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=82=92=E3=83=93=E3=83=AB=E3=83=89=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4=E3=80=82=20?= =?UTF-8?q?=E3=83=BBkeys/dummy/rsa=E4=BB=A5=E4=B8=8B=E3=81=AB=E3=83=80?= =?UTF-8?q?=E3=83=9F=E3=83=BC=E9=8D=B5=E3=82=92=E8=BF=BD=E5=8A=A0=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@9 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/buildtools/commondefs | 17 ++++++++--------- build/norfirm/norfirm-empty/Makefile | 6 ++++-- build/norfirm/norfirm-print/Makefile | 5 ++++- keys/dummy/rsa/private_gcd.der | Bin 0 -> 609 bytes keys/dummy/rsa/private_nand.der | Bin 0 -> 607 bytes keys/dummy/rsa/private_nor.der | Bin 0 -> 607 bytes keys/dummy/rsa/pubkey_gcd.der | Bin 0 -> 162 bytes keys/dummy/rsa/pubkey_nand.der | Bin 0 -> 162 bytes keys/dummy/rsa/pubkey_nor.der | Bin 0 -> 162 bytes 9 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 keys/dummy/rsa/private_gcd.der create mode 100644 keys/dummy/rsa/private_nand.der create mode 100644 keys/dummy/rsa/private_nor.der create mode 100644 keys/dummy/rsa/pubkey_gcd.der create mode 100644 keys/dummy/rsa/pubkey_nand.der create mode 100644 keys/dummy/rsa/pubkey_nor.der diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index 1b374cb1..2b293d02 100644 --- a/build/buildtools/commondefs +++ b/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 # diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile index 66b5207c..ddf84245 100644 --- a/build/norfirm/norfirm-empty/Makefile +++ b/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) diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile index 0882ebe9..b1407929 100644 --- a/build/norfirm/norfirm-print/Makefile +++ b/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) diff --git a/keys/dummy/rsa/private_gcd.der b/keys/dummy/rsa/private_gcd.der new file mode 100644 index 0000000000000000000000000000000000000000..91e7fe42ef394828046f918f0b20fdce4ccb3ca9 GIT binary patch literal 609 zcmV-n0-pUaf&yIv0RRGlfdKE=pK%j@IE3J3;#*^C@}4Q~9R>}bc`n`PS1VhFsoVrL zKQG}CGRP1!6yCrPfQAd^>$+7Mm5&sX6ZP_4>+$%1J$USr*XjpF2Ig1u-4)c4EFL(2 z`VuzeHF{ewHGij$6eCnU_HFb_!EGkua-FGFlNyRT8>d;YF!yD1>eT`R0RRC4fq-Vx zw}=9hS|^@9U zj5CVf6)>B3C~p5wXq{3c!cq>GY+AD%;6f`>)RmndJ{hj@XSP44CQIrdtc&)bS*aXU zznd}?t?Z0d&9i9$e|2cXtro}mzySh50RF-;eq;8UE+W&~!)Bvcc2E>py!Xjb4_*9C z(0^lGX%kNs=g($nq_~^Qgf)&YwuQ~JCs&EM?6VOZ$7?!+l>$Kk@dMMDGE0=V61OrK zD9ShT%`k6EIXm;W%Vd4P(_fzEoR&fjwwA3hif&}uewfGEG8TdQ-4nbD!WWk(RCW46 z0zm-K6q`zEsjW*3rBI}kJI(NH{sD0BPM(L?vr%_{&ozwfGRVf}sg#_3KCWe6xj$EttktnQ7@^TE#c=)hvFM zaGCqWv~w+^ykLYU4Bts{3wOQ$6uR8afYk&2>A?a(6OqYjlX3Ktfkm!`#yqN}sx??J vir`~Fi7|C3#Uy{)P?fl~V0S)6k{N|&pgBm?{EQ*_6ov?zM|F2W0`!6%71$z1 literal 0 HcmV?d00001 diff --git a/keys/dummy/rsa/private_nand.der b/keys/dummy/rsa/private_nand.der new file mode 100644 index 0000000000000000000000000000000000000000..771e3bf3e8d052e43601e6a02c5b33e6dfbf6fca GIT binary patch literal 607 zcmV-l0-*gcf&yCt0RRGlfdHj5&VEJ0`=e!bLnznEpLp$;4CC8jH%vOQwf|rygF|=g z6e}-U^O263q;|$@kiGq=F3DqrW&ylK!uYQ>u2SF!o$3lk(0zrd>m0)M)a!`)TcUjk zn3mts8{Pgyy(Z^L-;dE`3eIP-NHEUiOHfE>g6{oU$@|m2KcAd|5A6a20RRC4fq*(O ztF_aCLH}n64W?g>qU(rOLslrea4k$Hxx&Hj4ks*w;}T{cu!=<6G={9GgYy7!>Ob~0$h0i$gl0Uk*YDyZEF}3i7=l-< z8BvAy_+2S#Avx@c_?NjuDEJV;z)1o@0M%c=1(HgL_vm%P5B~(Oij(IY!cPBPvi}T$ zEmHa;2)-R3T;%P;PPRu0Zjq}@C+Vxuy>`i2@yNe&`&tV1M*=|r#x#CbZHeZ7Z(`Hk zpT}Dyx44J3orEl@*R8GyF?~PVOC!VmUi|nFN{oNRIFC<5QI_icmS%!LE>EH;Le6R#tg+pqd&RBF>()cENo%!`pY?! z8|Eu8GVn@iPl0*@;hci#22c_Znlk`ZD? literal 0 HcmV?d00001 diff --git a/keys/dummy/rsa/private_nor.der b/keys/dummy/rsa/private_nor.der new file mode 100644 index 0000000000000000000000000000000000000000..2f3aba7b3df8b583aadad4448c13864a922abf44 GIT binary patch literal 607 zcmV-l0-*gcf&yCt0RRGlfdII%=wwufXTYE3bn@{ziGxbymyLnC?Ms&=zIJRGY+`9Bkp zS42VT$@V`rMhdb$!mGvewFmVRj#$W{F6dh&Cf{x4QW54BH>E-JRP_P_0RRC4fq;57 z9kb<1gBUHe!XZur=skOUt=jMqBb#)x*JHdpm3gqwWN`DF*{%19#Kge%;`qvXK~m00 z18MsIw3hMq4gr;g4@ zpEEY1RV{zgr0hv~xP?~2$c~^ECouv+0OX#_o^rLh06Dq1K@j4oM^XcSLqxF4Ir`{E zx364S&m7Yw7tU{WenvMX?xRd#G4WsD@27LD@>>@bjwDmbMTwwyG9RkRoC9XB z0zf!!o)TGnQ_~}Cop-7vSf^?(B+kV6;^9a3=jGLKB1`S7acp@?1^m}7i;6-$4#?9! z44J%No?XPWpdZK@`g;OEF%Ii+Z@Utv0;ca=w85H|6TK*ei8Ql0XHG`WJ}33a|Fo#r zV8MG9smQeb-*=E8LfMBdg<3*DL>ZFr#2jL60zi3x%2p;4=T?d%Th)}YHgi4fjs0DO tESjqeeDFQcg@8TkNSca&yyDUQ7))uU9{w;BF+c-c#ZgY3^qhq7M3sUxD|7$= literal 0 HcmV?d00001 diff --git a/keys/dummy/rsa/pubkey_gcd.der b/keys/dummy/rsa/pubkey_gcd.der new file mode 100644 index 0000000000000000000000000000000000000000..b9cc07d19d108fb0ff105e7a125419a72ed8f80c GIT binary patch literal 162 zcmV;T0A2qufuAr91_>&LNQU^h?2QCgO6Psa2C2iaHyo QS+FqoWpnD)0s{d60Ul*VjsO4v literal 0 HcmV?d00001 diff --git a/keys/dummy/rsa/pubkey_nand.der b/keys/dummy/rsa/pubkey_nand.der new file mode 100644 index 0000000000000000000000000000000000000000..cbd2740d1d66cd79144b8c430856aa5697d6b512 GIT binary patch literal 162 zcmV;T0A2qufuAr91_>&LNQU(PRqFXR$~y&g4r_NN0lX{aMNT Q)4e~RoPiJR0s{d60WPpkQUCw| literal 0 HcmV?d00001 diff --git a/keys/dummy/rsa/pubkey_nor.der b/keys/dummy/rsa/pubkey_nor.der new file mode 100644 index 0000000000000000000000000000000000000000..3c3999eb6d2c7743ca16454fc75e1ba3417ed80f GIT binary patch literal 162 zcmV;T0A2qufuAr91_>&LNQU{KT`QW6OmU$LF&o&KQ%@QvOU79#q+fX^%IU*$e}LiTO}snZRJuC Q<`y@lLG)Dh0s{d60fXpBtN;K2 literal 0 HcmV?d00001