From 194750d17ae2d06f638457fe0033b95607133762 Mon Sep 17 00:00:00 2001 From: yosiokat Date: Thu, 26 Jun 2008 05:44:02 +0000 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0?= =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=80=8D=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=88=E3=83=ABID=E3=82=92?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E3=81=AA=E5=80=A4"HNLA"=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=80=82=20=E4=B8=8A=E8=A8=98=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=88=E3=83=AB=E3=82=92systemMenu=5Fmastering=E3=81=A8Syste?= =?UTF-8?q?mUpdater=E3=81=AB=E5=AF=BE=E5=BF=9C=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@1721 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/systemMenu_RED/sysmenuVersion/Makefile | 11 ++++------ .../sysmenuVersion/commondefs.sysmenuVersion | 22 +++++++++++++++++++ build/systemMenu_mastering/Makefile | 14 ++++++++++++ .../SystemUpdater/data/Makefile | 6 +++++ 4 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile b/build/systemMenu_RED/sysmenuVersion/Makefile index fcee1f00..e07d7df0 100644 --- a/build/systemMenu_RED/sysmenuVersion/Makefile +++ b/build/systemMenu_RED/sysmenuVersion/Makefile @@ -23,6 +23,7 @@ TARGET_FIRM = SYSTEMMENU include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include ./commondefs.sysmenuVersion VER_TIMESTAMP = 08062300 @@ -33,16 +34,12 @@ MINOR_VERSION = 1 # ユーザー領域サイズ(=128MB) USER_AREA_SIZE = 134217728 -VERSION_FILE = SysmenuVersion.dat - GEN_VERSION_FILE = $(SYSMENU_TOOLSDIR)/bin/genVersion.plx -VERSION_MAKETAD_OPTION += -s -d 0003000F484E4c41 3031 0 SYSM_VERSION -v 0 -p - VERSION_TAD = HNLA.tad ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) - VERSION_DAT = $(VERSION_FILE) + VERSION_DAT = $(SYSMENU_VERSION_FILE) endif TARGETS += $(VERSION_TAD) @@ -60,7 +57,7 @@ do-build : $(VERSION_TAD) $(VERSION_DAT): $(GEN_VERSION_FILE) $(VER_TIMESTAMP) $(MAJOR_VERSION) $(MINOR_VERSION) $(USER_AREA_SIZE) -$(VERSION_TAD) : $(VERSION_FILE) - $(MAKETAD) $(call empath,$<) $(VERSION_MAKETAD_OPTION) -o $@ +$(VERSION_TAD) : $(SYSMENU_VERSION_FILE) + $(MAKETAD) $(call empath,$<) $(SYSMENU_VERSION_MAKETAD_OPTION) -o $@ #===== End of Makefile ===== diff --git a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion new file mode 100644 index 00000000..1806d799 --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion @@ -0,0 +1,22 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: commondefs.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: +#---------------------------------------------------------------------------- + +SYSMENU_VERSION_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion +SYSMENU_VERSION_FILE = SysmenuVersion.dat +SYSMENU_VERSION_MAKETAD_OPTION += -s -d 0003000F484E4c41 3031 0 SYSM_VERSION -v 0 -p + diff --git a/build/systemMenu_mastering/Makefile b/build/systemMenu_mastering/Makefile index 25d2ed5c..4a88a361 100644 --- a/build/systemMenu_mastering/Makefile +++ b/build/systemMenu_mastering/Makefile @@ -47,6 +47,7 @@ TARGETS = $(OUT_DIR)/HNAA \ $(OUT_DIR)/HNBA \ $(OUT_DIR)/HNCA \ $(OUT_DIR)/HNHA \ + $(OUT_DIR)/HNLA \ $(OUT_DIR)/TWLFontTable.dat \ $(OUT_DIR)/menu_launcher-$(TWL_BUILD_TYPE).nand \ $(OUT_DIR)/$(NAND_INITIALIZER_NAME)-$(TWL_BUILD_TYPE)$(MASTER).srl @@ -132,6 +133,19 @@ else cp $< $(OUT_DIR) endif +#--------------------------- +#システムメニューバージョン +#--------------------------- +# [TODO] TADからバージョンを取得して、バージョン番号でディレクトリを作成する。 +$(OUT_DIR)/HNLA : $(SYSMENU_DIR)/sysmenuVersion/HNLA.tad +ifeq ($(DO_MASTERING),TRUE) + mkdir -p $(OUT_DIR)/$(notdir $(basename $<)) + mkdir -p $(OUT_DIR)/$(notdir $(basename $<))/V0 + cp $< ./$@/V0/ + cp $(dir $<)/properties ./$@ +else + cp $< $(OUT_DIR) +endif #--------------------------- #共有フォント diff --git a/build/systemMenu_tools/SystemUpdater/data/Makefile b/build/systemMenu_tools/SystemUpdater/data/Makefile index cc33e22c..a9590ecd 100644 --- a/build/systemMenu_tools/SystemUpdater/data/Makefile +++ b/build/systemMenu_tools/SystemUpdater/data/Makefile @@ -21,6 +21,7 @@ TARGET_FIRM = SYSTEMMENU include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(SYSMENU_ROOT)/build/systemMenu_RED/wlanfirm/commondefs.wlanfirm include $(SYSMENU_ROOT)/build/systemMenu_RED/DSHashTable/commondefs.DSHashTable +include $(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion # SystemUpdaterでインポートするTADは専用のmaketadでTAD化します。 MAKETAD := $(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe @@ -33,6 +34,7 @@ LDIRT_CLEAN = HNAA.tad \ HNBA.tad \ HNCA.tad \ HNHA.tad \ + HNLA.tad \ menu_launcher.nand #---------------------------------------------------------------------------- @@ -43,6 +45,7 @@ do-build : HNAA.tad \ HNBA.tad \ HNCA.tad \ HNHA.tad \ + HNLA.tad \ menu_launcher.nand @@ -60,6 +63,9 @@ HNCA.tad: $(MY_WLANFIRM) HNHA.tad: $(DS_HASH_TABLE_DATA) $(MAKETAD) $(call empath,$<) $(DS_HASH_TABLE_MAKETAD_OPTION) -o $@ +HNLA.tad: $(SYSMENU_VERSION_DIR)/$(SYSMENU_VERSION_FILE) + $(MAKETAD) $(call empath,$<) $(SYSMENU_VERSION_MAKETAD_OPTION) -o $@ + menu_launcher.nand: ../../../nandfirm/menu-launcher/menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand cp $< ./$@