diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile b/build/systemMenu_RED/sysmenuVersion/Makefile index b57d508b..b15e49aa 100644 --- a/build/systemMenu_RED/sysmenuVersion/Makefile +++ b/build/systemMenu_RED/sysmenuVersion/Makefile @@ -22,63 +22,13 @@ # 現在、製品版の証明書を含んだものは生成しない -override TARGET_PLATFORM := TWL -override TWL_ARCHGEN := LIMITED -TARGET_FIRM = SYSTEMMENU -TWL_NANDAPP = TRUE +override TARGET_PLATFORM := TWL + +SUBMAKES = Makefile.A Makefile.J Makefile.E Makefile.P Makefile.U + include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -include ./commondefs.sysmenuVersion - -DST_DIR = $(SYSMENU_VERSION_TARGET) -REGION ?= A - -# タイムスタンプ -VER_TIMESTAMP = 08073100 - -# システムメニューバージョン -MAJOR_VERSION = 0 -MINOR_VERSION = 1 -STR_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)$(REGION) - -# ユーザー領域サイズ(=128MB) -USER_AREA_SIZE = 134217728 - -# NUPホストネーム -NUP_HOSTNAME = nus.t.shop.nintendowifi.net:443 - -# EULAのURL -EULA_URL = https://cfh.t.app.nintendowifi.net/eula/ - -GEN_VERSION_PARAM = $(DST_DIR) $(VER_TIMESTAMP) $(STR_VERSION) $(MAJOR_VERSION) $(MINOR_VERSION) \ - $(USER_AREA_SIZE) $(NUP_HOSTNAME) $(EULA_URL) - -GEN_VERSION_FILE = $(SYSMENU_TOOLSDIR)/bin/genVersion.plx - -VERSION_TAD = HNL$(REGION).$(SYSMENU_VERSION_TARGET).tad - -ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) - VERSION_DAT = $(SYSMENU_VERSION_FILE) -endif - -TARGETS += $(VERSION_TAD) - -#---------------------------------------------------------------------------- - -LDIRT_CLEAN = $(VERSION_DAT) $(VERSION_TAD) properties - -#---------------------------------------------------------------------------- - include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules -do-build : $(VERSION_TAD) - -$(VERSION_DAT): ./Makefile ./commondefs.sysmenuVersion - $(GEN_VERSION_FILE) $(GEN_VERSION_PARAM) - mv SysmenuVersion.dat SysmenuVersion.$(SYSMENU_VERSION_TARGET).dat - -$(VERSION_TAD) : $(SYSMENU_VERSION_FILE) - $(MAKETAD) $(call empath,$<) $(SYSMENU_VERSION_MAKETAD_OPTION) -o $@ - #===== End of Makefile ===== diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile.A b/build/systemMenu_RED/sysmenuVersion/Makefile.A new file mode 100644 index 00000000..add75cdf --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/Makefile.A @@ -0,0 +1,42 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile - +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: +# $Rev: +# $Author: +#---------------------------------------------------------------------------- + +override TARGET_PLATFORM := TWL + +TARGET_FIRM = SYSTEMMENU +TWL_NANDAPP = TRUE + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include ./commondefs.sysmenuVersion +include ./commondefs.sysmenuVersion.local + +#--------------------------------------------------------- +# リージョン固有パラメータ + +SYSMENU_VERSION_REGION = A +SYSMENU_VERSION_TIMESTAMP = 08081100 +SYSMENU_VERSION_MAJOR = 0 +SYSMENU_VERSION_MINOR = 0 + +do-build : $(TARGET_BIN) + +#---------------------------------------------------------------------------- +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +include ./modulerules.sysmenuVersion + +#===== End of Makefile ===== diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile.E b/build/systemMenu_RED/sysmenuVersion/Makefile.E new file mode 100644 index 00000000..ad9a10a2 --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/Makefile.E @@ -0,0 +1,42 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile - +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: +# $Rev: +# $Author: +#---------------------------------------------------------------------------- + +override TARGET_PLATFORM := TWL + +TARGET_FIRM = SYSTEMMENU +TWL_NANDAPP = TRUE + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include ./commondefs.sysmenuVersion +include ./commondefs.sysmenuVersion.local + +#--------------------------------------------------------- +# リージョン固有パラメータ + +SYSMENU_VERSION_REGION = E +SYSMENU_VERSION_TIMESTAMP = 08081100 +SYSMENU_VERSION_MAJOR = 0 +SYSMENU_VERSION_MINOR = 0 + +do-build : $(TARGET_BIN) + +#---------------------------------------------------------------------------- +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +include ./modulerules.sysmenuVersion + +#===== End of Makefile ===== diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile.J b/build/systemMenu_RED/sysmenuVersion/Makefile.J new file mode 100644 index 00000000..c4a2f2a1 --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/Makefile.J @@ -0,0 +1,42 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile - +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: +# $Rev: +# $Author: +#---------------------------------------------------------------------------- + +override TARGET_PLATFORM := TWL + +TARGET_FIRM = SYSTEMMENU +TWL_NANDAPP = TRUE + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include ./commondefs.sysmenuVersion +include ./commondefs.sysmenuVersion.local + +#--------------------------------------------------------- +# リージョン固有パラメータ + +SYSMENU_VERSION_REGION = J +SYSMENU_VERSION_TIMESTAMP = 08081100 +SYSMENU_VERSION_MAJOR = 0 +SYSMENU_VERSION_MINOR = 0 + +do-build : $(TARGET_BIN) + +#---------------------------------------------------------------------------- +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +include ./modulerules.sysmenuVersion + +#===== End of Makefile ===== diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile.P b/build/systemMenu_RED/sysmenuVersion/Makefile.P new file mode 100644 index 00000000..4c6fdd0c --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/Makefile.P @@ -0,0 +1,42 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile - +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: +# $Rev: +# $Author: +#---------------------------------------------------------------------------- + +override TARGET_PLATFORM := TWL + +TARGET_FIRM = SYSTEMMENU +TWL_NANDAPP = TRUE + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include ./commondefs.sysmenuVersion +include ./commondefs.sysmenuVersion.local + +#--------------------------------------------------------- +# リージョン固有パラメータ + +SYSMENU_VERSION_REGION = P +SYSMENU_VERSION_TIMESTAMP = 08081100 +SYSMENU_VERSION_MAJOR = 0 +SYSMENU_VERSION_MINOR = 0 + +do-build : $(TARGET_BIN) + +#---------------------------------------------------------------------------- +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +include ./modulerules.sysmenuVersion + +#===== End of Makefile ===== diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile.U b/build/systemMenu_RED/sysmenuVersion/Makefile.U new file mode 100644 index 00000000..86e61df2 --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/Makefile.U @@ -0,0 +1,42 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile - +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: +# $Rev: +# $Author: +#---------------------------------------------------------------------------- + +override TARGET_PLATFORM := TWL + +TARGET_FIRM = SYSTEMMENU +TWL_NANDAPP = TRUE + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include ./commondefs.sysmenuVersion +include ./commondefs.sysmenuVersion.local + +#--------------------------------------------------------- +# リージョン固有パラメータ + +SYSMENU_VERSION_REGION = U +SYSMENU_VERSION_TIMESTAMP = 08081100 +SYSMENU_VERSION_MAJOR = 0 +SYSMENU_VERSION_MINOR = 0 + +do-build : $(TARGET_BIN) + +#---------------------------------------------------------------------------- +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +include ./modulerules.sysmenuVersion + +#===== End of Makefile ===== diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.A.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.A.dat new file mode 100644 index 00000000..f1741aef Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.A.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.E.dat similarity index 96% rename from build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.dat rename to build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.E.dat index 6bb161ad..acadcac3 100644 Binary files a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.dat and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.E.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.J.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.J.dat new file mode 100644 index 00000000..48e0af40 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.J.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.P.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.P.dat new file mode 100644 index 00000000..8efafcab Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.P.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.U.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.U.dat new file mode 100644 index 00000000..6d3be2f0 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.U.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.A.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.A.dat new file mode 100644 index 00000000..b28ea716 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.A.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.E.dat similarity index 96% rename from build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.dat rename to build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.E.dat index 6aa0432b..1619d2c7 100644 Binary files a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.dat and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.E.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.J.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.J.dat new file mode 100644 index 00000000..6146cc52 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.J.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.P.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.P.dat new file mode 100644 index 00000000..eda790c1 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.P.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.U.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.U.dat new file mode 100644 index 00000000..8baaff26 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.U.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion index c54fd2fb..982964bc 100644 --- a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion +++ b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion @@ -16,6 +16,24 @@ # $Author: #---------------------------------------------------------------------------- +#--------------------------------------------------------- +# リージョン共通パラメータ + +# ユーザー領域サイズ(=128MB) +USER_AREA_SIZE = 134217728 + +# NUPホストネーム +NUP_HOSTNAME = nus.t.shop.nintendowifi.net:443 + +# EULAのURL +EULA_URL = https://cfh.t.app.nintendowifi.net/eula/ + +# バージョン文字列 +STR_VERSION = $(SYSMENU_VERSION_MAJOR).$(SYSMENU_VERSION_MAJOR)$(SYSMENU_VERSION_REGION) + +#--------------------------------------------------------- +# 外部使用変数 + ifeq ($(FIRM_USE_PRODUCT_KEYS),TRUE) SYSMENU_VERSION_TARGET = prod else @@ -23,6 +41,7 @@ SYSMENU_VERSION_TARGET = dev endif SYSMENU_VERSION_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion -SYSMENU_VERSION_FILE = SysmenuVersion.$(SYSMENU_VERSION_TARGET).dat +SYSMENU_VERSION_FILE = SysmenuVersion.$(SYSMENU_VERSION_TARGET).$(SYSMENU_VERSION_REGION).dat SYSMENU_VERSION_MAKETAD_OPTION += -s -d 0003000F484E4c41 3031 0 SYSM_VERSION -v 0 -p +SYSMENU_VERSION_REGION ?= A diff --git a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion.local b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion.local new file mode 100644 index 00000000..b11d402f --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion.local @@ -0,0 +1,37 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: commondefs.sysmenuVersion.local +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: +# $Rev: +# $Author: +#---------------------------------------------------------------------------- + +#--------------------------------------------------------- +# 内部使用変数 + +GEN_VERSION_PARAM = $(SYSMENU_VERSION_TARGET) $(SYSMENU_VERSION_TIMESTAMP) $(STR_VERSION) $(SYSMENU_VERSION_MAJOR) $(SYSMENU_VERSION_MINOR) \ + $(USER_AREA_SIZE) $(NUP_HOSTNAME) $(EULA_URL) $(SYSMENU_VERSION_FILE) + +GEN_VERSION_FILE = $(SYSMENU_TOOLSDIR)/bin/genVersion.plx + +VERSION_TITLEID_LO = HNL$(SYSMENU_VERSION_REGION) +VERSION_TAD = $(BINDIR)/$(VERSION_TITLEID_LO).$(SYSMENU_VERSION_TARGET).tad + +ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) + VERSION_DAT = $(SYSMENU_VERSION_FILE) +endif + +BINDIR = $(SYSMENU_VERSION_TARGET).out/$(VERSION_TITLEID_LO) +TARGET_BIN = $(VERSION_TAD) + +LDIRT_CLEAN += $(VERSION_DAT) $(VERSION_TAD) $(BINDIR)/properties $(BINDIR) diff --git a/build/systemMenu_RED/sysmenuVersion/modulerules.sysmenuVersion b/build/systemMenu_RED/sysmenuVersion/modulerules.sysmenuVersion new file mode 100644 index 00000000..5e363614 --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/modulerules.sysmenuVersion @@ -0,0 +1,25 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: modulerules.sysmenuVersion +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Date:: +# $Rev: +# $Author: +#---------------------------------------------------------------------------- + +$(VERSION_DAT): ./Makefile ./commondefs.sysmenuVersion + $(GEN_VERSION_FILE) $(GEN_VERSION_PARAM) + +$(VERSION_TAD) : $(SYSMENU_VERSION_FILE) + mkdir -p $(BINDIR) + $(MAKETAD) $(call empath,$<) $(SYSMENU_VERSION_MAKETAD_OPTION) -o $@ + diff --git a/build/systemMenu_mastering/Makefile b/build/systemMenu_mastering/Makefile index 1c9d7cc1..a2cd5b0b 100644 --- a/build/systemMenu_mastering/Makefile +++ b/build/systemMenu_mastering/Makefile @@ -140,7 +140,7 @@ endif #--------------------------- # [TODO] TADからバージョンを取得して、バージョン番号でディレクトリを作成する。 # FIRM_USE_PRODUCT_KEYS = TRUE の時のみPROD用のシステムメニューバージョンを取得します。 -$(OUT_DIR)/HNLA : $(SYSMENU_DIR)/sysmenuVersion/HNLA.$(SYSMENU_VERSION_TARGET).tad +$(OUT_DIR)/HNLA : $(SYSMENU_DIR)/sysmenuVersion/$(SYSMENU_VERSION_TARGET).out/HNLA/HNLA.$(SYSMENU_VERSION_TARGET).tad ifeq ($(DO_MASTERING),TRUE) mkdir -p $@ mkdir -p $@/V0 diff --git a/tools/bin/genVersion.plx b/tools/bin/genVersion.plx index 1340f6c1..30cf04e8 100644 --- a/tools/bin/genVersion.plx +++ b/tools/bin/genVersion.plx @@ -15,8 +15,8 @@ use POSIX 'strftime'; use File::Basename; -if ($#ARGV < 7) { - printf STDOUT ("Usage: %s [genVersion] dir timestamp strVersion majorVersion minorVersion userAreaSize NUPHostName EULAURL\n", $0); +if ($#ARGV < 8) { + printf STDOUT ("Usage: %s [genVersion] dir timestamp strVersion majorVersion minorVersion userAreaSize NUPHostName EULAURL outFile\n", $0); exit(-1); } @@ -39,7 +39,7 @@ my $urlEULAFile = "$dataDir/eula_url.bin"; #my $rootCACert4SSLFile6 = "$dataDir/root_ca_cert4ssl6"; # 出力ファイル -my $outFile = "SysmenuVersion.dat"; +my $outFile = $ARGV[8]; # 中間ファイル my $archiveFile = "archive.narc";