From 44e2ea804307fa0bcd237d0c14fcb00b033102c3 Mon Sep 17 00:00:00 2001 From: yutaka Date: Tue, 15 Apr 2008 05:54:02 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9B=E3=83=AF=E3=82=A4=E3=83=88=E3=83=AA?= =?UTF-8?q?=E3=82=B9=E3=83=88=E9=96=A2=E9=80=A3=E3=83=A9=E3=82=A4=E3=83=96?= =?UTF-8?q?=E3=83=A9=E3=83=AAAPI=E3=82=92dht=E3=83=A9=E3=82=A4=E3=83=96?= =?UTF-8?q?=E3=83=A9=E3=83=AA=E3=81=AB=E5=86=8D=E6=A7=8B=E6=88=90(?= =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=81=95=E3=81=9B=E3=81=9F=E3=81=A0=E3=81=91?= =?UTF-8?q?)=20=E3=81=82=E3=81=84=E3=81=8B=E3=82=8F=E3=82=89=E3=81=9ADHT?= =?UTF-8?q?=5FTEST=3DTRUE=E3=81=A4=E3=81=8D=E3=81=A7=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E3=81=97=E3=81=AA=E3=81=84=E3=81=A8=E3=81=A9=E3=81=93?= =?UTF-8?q?=E3=81=8B=E3=82=89=E3=82=82=E5=91=BC=E3=81=B0=E3=82=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84?= 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@1136 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/buildtools/commondefs.sysmenu | 2 + build/libraries_sysmenu/Makefile | 2 +- build/libraries_sysmenu/dht/ARM7/Makefile | 43 +++++++++++++++++ build/libraries_sysmenu/dht/ARM9/Makefile | 47 +++++++++++++++++++ build/libraries_sysmenu/dht/Makefile | 30 ++++++++++++ .../dht/common}/src/dht.c | 0 build/tests/CheckDSHashTable/Makefile | 3 +- 7 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 build/libraries_sysmenu/dht/ARM7/Makefile create mode 100644 build/libraries_sysmenu/dht/ARM9/Makefile create mode 100644 build/libraries_sysmenu/dht/Makefile rename build/{tests/CheckDSHashTable => libraries_sysmenu/dht/common}/src/dht.c (100%) diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index 2af8f79a..012b9bf2 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -71,6 +71,7 @@ SYSMENU_LIBS ?= \ libmbloader$(TWL_LIBSUFFIX).a \ libboot$(TWL_LIBSUFFIX).a \ libds$(TWL_LIBSUFFIX).a \ + libdht$(TWL_LIBSUFFIX).a \ else # ($(CODEGEN_PROC),ARM7) @@ -81,6 +82,7 @@ SYSMENU_LIBS ?= \ libboot_sp$(TWL_LIBSUFFIX).a \ libds_sp$(TWL_LIBSUFFIX).a \ libhotsw_sp$(TWL_LIBSUFFIX).a \ + libdht_sp$(TWL_LIBSUFFIX).a \ endif diff --git a/build/libraries_sysmenu/Makefile b/build/libraries_sysmenu/Makefile index cdd6bc51..7bd41f8c 100644 --- a/build/libraries_sysmenu/Makefile +++ b/build/libraries_sysmenu/Makefile @@ -22,7 +22,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -SUBDIRS_P = reloc_info sysmenu mb_loader acsign boot hotsw namut mcu ds +SUBDIRS_P = reloc_info sysmenu mb_loader acsign boot hotsw namut mcu ds dht #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/dht/ARM7/Makefile b/build/libraries_sysmenu/dht/ARM7/Makefile new file mode 100644 index 00000000..ad84e31b --- /dev/null +++ b/build/libraries_sysmenu/dht/ARM7/Makefile @@ -0,0 +1,43 @@ +#! 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$ +#---------------------------------------------------------------------------- + +SUBDIRS = + +#---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU +TARGET_PLATFORM = TWL +TWL_ARCHGEN = LIMITED +TWL_PROC = ARM7 + +SRCDIR = ../common/src +SRCS = dht.c + +TARGET_LIB = libdht_sp$(TWL_LIBSUFFIX).a + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + +INSTALL_TARGETS = $(TARGETS) +INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) + +#---------------------------------------------------------------------------- + +do-build: $(TARGETS) + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules + +#===== End of Makefile ===== diff --git a/build/libraries_sysmenu/dht/ARM9/Makefile b/build/libraries_sysmenu/dht/ARM9/Makefile new file mode 100644 index 00000000..58b7d50f --- /dev/null +++ b/build/libraries_sysmenu/dht/ARM9/Makefile @@ -0,0 +1,47 @@ +#! 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$ +#---------------------------------------------------------------------------- + +SUBDIRS = + +MYSUBDIRS = ./ + +#---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU +TARGET_PLATFORM = TWL +TWL_ARCHGEN = LIMITED +TWL_PROC = ARM9 + +SRCDIR = ../common/src +SRCS = dht.c + +TARGET_LIB = libdht$(TWL_LIBSUFFIX).a + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + +INSTALL_TARGETS = $(TARGETS) +INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) + +LDIRT_CLEAN = $(REVISION_SRC) + +#---------------------------------------------------------------------------- + +do-build: $(REVISION_SRC) $(MYSUBDIRS) $(TARGETS) + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules + +#===== End of Makefile ===== diff --git a/build/libraries_sysmenu/dht/Makefile b/build/libraries_sysmenu/dht/Makefile new file mode 100644 index 00000000..6335ad0a --- /dev/null +++ b/build/libraries_sysmenu/dht/Makefile @@ -0,0 +1,30 @@ +#! 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$ +#---------------------------------------------------------------------------- + +TARGET_FIRM = SYSTEMMENU +SUBDIRS = ARM7 ARM9 + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs + +#---------------------------------------------------------------------------- + +do-build: $(TARGETS) + +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules + +#===== End of Makefile ===== diff --git a/build/tests/CheckDSHashTable/src/dht.c b/build/libraries_sysmenu/dht/common/src/dht.c similarity index 100% rename from build/tests/CheckDSHashTable/src/dht.c rename to build/libraries_sysmenu/dht/common/src/dht.c diff --git a/build/tests/CheckDSHashTable/Makefile b/build/tests/CheckDSHashTable/Makefile index 1edefe22..b88e3a15 100644 --- a/build/tests/CheckDSHashTable/Makefile +++ b/build/tests/CheckDSHashTable/Makefile @@ -24,8 +24,7 @@ TARGET_PLATFORM := TWL TARGET_FIRM := SYSTEMMENU override TWL_ARCHGEN := LIMITED -SRCS = main.c dht.c -LINCLUDES = include +SRCS = main.c TARGET_BIN = CheckDSHashTable.srl ROM_SPEC = CheckDSHashTable.rsf