diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile b/build/systemMenu_RED/sysmenuVersion/Makefile index 5093c7ce..b57d508b 100644 --- a/build/systemMenu_RED/sysmenuVersion/Makefile +++ b/build/systemMenu_RED/sysmenuVersion/Makefile @@ -31,11 +31,11 @@ TWL_NANDAPP = TRUE include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include ./commondefs.sysmenuVersion +DST_DIR = $(SYSMENU_VERSION_TARGET) REGION ?= A -DST_DIR = dev # タイムスタンプ -VER_TIMESTAMP = 08062300 +VER_TIMESTAMP = 08073100 # システムメニューバージョン MAJOR_VERSION = 0 @@ -56,7 +56,7 @@ GEN_VERSION_PARAM = $(DST_DIR) $(VER_TIMESTAMP) $(STR_VERSION) $(MAJOR_VERSION) GEN_VERSION_FILE = $(SYSMENU_TOOLSDIR)/bin/genVersion.plx -VERSION_TAD = HNL$(REGION).tad +VERSION_TAD = HNL$(REGION).$(SYSMENU_VERSION_TARGET).tad ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) VERSION_DAT = $(SYSMENU_VERSION_FILE) @@ -66,7 +66,7 @@ TARGETS += $(VERSION_TAD) #---------------------------------------------------------------------------- -LDIRT_CLEAN = $(VERSION_TAD) properties +LDIRT_CLEAN = $(VERSION_DAT) $(VERSION_TAD) properties #---------------------------------------------------------------------------- @@ -76,6 +76,7 @@ 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 $@ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.dat similarity index 69% rename from build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dat rename to build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.dat index 08811c5a..6bb161ad 100644 Binary files a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dat and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.dat new file mode 100644 index 00000000..6aa0432b Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion index 1806d799..c54fd2fb 100644 --- a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion +++ b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion @@ -16,7 +16,13 @@ # $Author: #---------------------------------------------------------------------------- +ifeq ($(FIRM_USE_PRODUCT_KEYS),TRUE) +SYSMENU_VERSION_TARGET = prod +else +SYSMENU_VERSION_TARGET = dev +endif + SYSMENU_VERSION_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion -SYSMENU_VERSION_FILE = SysmenuVersion.dat +SYSMENU_VERSION_FILE = SysmenuVersion.$(SYSMENU_VERSION_TARGET).dat SYSMENU_VERSION_MAKETAD_OPTION += -s -d 0003000F484E4c41 3031 0 SYSM_VERSION -v 0 -p diff --git a/build/systemMenu_RED/sysmenuVersion/dev/NintendoCA-C2.der b/build/systemMenu_RED/sysmenuVersion/dev/NintendoCA-C2.der deleted file mode 100644 index 1e389879..00000000 Binary files a/build/systemMenu_RED/sysmenuVersion/dev/NintendoCA-C2.der and /dev/null differ diff --git a/build/systemMenu_RED/sysmenuVersion/dev/NintendoCA.der b/build/systemMenu_RED/sysmenuVersion/dev/NintendoCA.der deleted file mode 100644 index 58e95b06..00000000 Binary files a/build/systemMenu_RED/sysmenuVersion/dev/NintendoCA.der and /dev/null differ diff --git a/build/systemMenu_RED/sysmenuVersion/prod/.TWL-NUP-Dev-1-cert.der b/build/systemMenu_RED/sysmenuVersion/prod/.TWL-NUP-Dev-1-cert.der deleted file mode 100644 index e59ffc91..00000000 Binary files a/build/systemMenu_RED/sysmenuVersion/prod/.TWL-NUP-Dev-1-cert.der and /dev/null differ diff --git a/build/systemMenu_RED/sysmenuVersion/prod/.TWL-Shop-Dev-1-cert.der b/build/systemMenu_RED/sysmenuVersion/prod/.TWL-Shop-Dev-1-cert.der deleted file mode 100644 index 8da20191..00000000 Binary files a/build/systemMenu_RED/sysmenuVersion/prod/.TWL-Shop-Dev-1-cert.der and /dev/null differ diff --git a/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-cert.der b/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-cert.der new file mode 100644 index 00000000..40be0190 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-cert.der differ diff --git a/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-dev-1-prvkey.der b/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-dev-1-prvkey.der deleted file mode 100644 index 83fce90f..00000000 Binary files a/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-dev-1-prvkey.der and /dev/null differ diff --git a/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-prvkey.der b/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-prvkey.der new file mode 100644 index 00000000..cfb2b340 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/prod/.twl-nup-prvkey.der differ diff --git a/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-cert.der b/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-cert.der new file mode 100644 index 00000000..813892c6 Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-cert.der differ diff --git a/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-dev-1-prvkey.der b/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-dev-1-prvkey.der deleted file mode 100644 index 1a1afdce..00000000 Binary files a/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-dev-1-prvkey.der and /dev/null differ diff --git a/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-prvkey.der b/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-prvkey.der new file mode 100644 index 00000000..73b149db Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/prod/.twl-shop-prvkey.der differ diff --git a/build/systemMenu_mastering/Makefile b/build/systemMenu_mastering/Makefile index 0dbb08e6..85b839ae 100644 --- a/build/systemMenu_mastering/Makefile +++ b/build/systemMenu_mastering/Makefile @@ -25,6 +25,7 @@ TWL_ARCHGEN = LIMITED TWL_NANDAPP = TRUE include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion ifeq ($(TWL_IPL_RED_PRIVATE_ROOT),) override DO_MASTERING = @@ -138,7 +139,7 @@ endif #システムメニューバージョン #--------------------------- # [TODO] TADからバージョンを取得して、バージョン番号でディレクトリを作成する。 -$(OUT_DIR)/HNLA : $(SYSMENU_DIR)/sysmenuVersion/HNLA.tad +$(OUT_DIR)/HNLA : $(SYSMENU_DIR)/sysmenuVersion/HNLA.$(SYSMENU_VERSION_TARGET).tad ifeq ($(DO_MASTERING),TRUE) mkdir -p $(OUT_DIR)/$(notdir $(basename $<)) mkdir -p $(OUT_DIR)/$(notdir $(basename $<))/V0