hwi.c関連以外はacsignライブラリをリンクしないように修正、

hwi.c関連はcryptoライブラリをリンクしないように修正 (TWLHWInfo.cでcryptoの方を使うようにすべき)

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@976 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2008-03-27 05:16:09 +00:00
parent fc8597b10a
commit 6005d7e993
7 changed files with 318 additions and 308 deletions

View File

@ -69,7 +69,6 @@ SYSMENU_LIBS ?= \
libsysmenu$(TWL_LIBSUFFIX).a \ libsysmenu$(TWL_LIBSUFFIX).a \
libsysmmcu$(TWL_LIBSUFFIX).a \ libsysmmcu$(TWL_LIBSUFFIX).a \
libmbloader$(TWL_LIBSUFFIX).a \ libmbloader$(TWL_LIBSUFFIX).a \
libacsign$(TWL_LIBSUFFIX).a \
libboot$(TWL_LIBSUFFIX).a \ libboot$(TWL_LIBSUFFIX).a \
libds$(TWL_LIBSUFFIX).a \ libds$(TWL_LIBSUFFIX).a \

View File

@ -44,7 +44,8 @@ SRCS = main.c HWInfoWriter.c hwi.c \
LINCLUDES = $(MISC_DIR)/include \ LINCLUDES = $(MISC_DIR)/include \
$(ROOT)/build/libraries/lcfg/ARM9.TWL/include $(ROOT)/build/libraries/lcfg/ARM9.TWL/include
LLIBRARIES = libacsign_enc$(TWL_LIBSUFFIX).a LLIBRARIES = libacsign$(TWL_LIBSUFFIX).a \
libacsign_enc$(TWL_LIBSUFFIX).a
ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),)
ifdef USE_PRODUCT_KEY ifdef USE_PRODUCT_KEY
@ -65,6 +66,8 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
GLIBRARIES := $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES))
LDIRT_CLEAN = $(TARGET_TAD) LDIRT_CLEAN = $(TARGET_TAD)
INSTALL_TARGETS = $(TARGET_TAD) INSTALL_TARGETS = $(TARGET_TAD)
INSTALL_DIR = $(SDK_NMENU_DATADIR) INSTALL_DIR = $(SDK_NMENU_DATADIR)

View File

@ -17,6 +17,7 @@
#include <twl.h> #include <twl.h>
#include <sysmenu.h> #include <sysmenu.h>
#include <sysmenu/acsign.h>
#include "TWLHWInfo_api.h" #include "TWLHWInfo_api.h"
#include "TWLSettings_api.h" #include "TWLSettings_api.h"
#include "hwi.h" #include "hwi.h"

View File

@ -88,6 +88,7 @@ LLIBRARIES += libes$(TWL_LIBSUFFIX).a \
libboc$(TWL_LIBSUFFIX).a \ libboc$(TWL_LIBSUFFIX).a \
libnam$(TWL_LIBSUFFIX).a \ libnam$(TWL_LIBSUFFIX).a \
libsea$(TWL_LIBSUFFIX).a \ libsea$(TWL_LIBSUFFIX).a \
libacsign$(TWL_LIBSUFFIX).a \
libacsign_enc$(TWL_LIBSUFFIX).a \ libacsign_enc$(TWL_LIBSUFFIX).a \
libnamut$(TWL_LIBSUFFIX).a libnamut$(TWL_LIBSUFFIX).a
@ -96,6 +97,8 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib
MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
GLIBRARIES := $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES))
LDIRT_CLEAN = $(TARGET_TAD) LDIRT_CLEAN = $(TARGET_TAD)
#INSTALL_TARGETS = $(TARGET_TAD) #INSTALL_TARGETS = $(TARGET_TAD)
#INSTALL_DIR = $(SDK_NMENU_DATADIR) #INSTALL_DIR = $(SDK_NMENU_DATADIR)

View File

@ -86,6 +86,7 @@ LLIBRARIES += libes$(TWL_LIBSUFFIX).a \
libboc$(TWL_LIBSUFFIX).a \ libboc$(TWL_LIBSUFFIX).a \
libnam$(TWL_LIBSUFFIX).a \ libnam$(TWL_LIBSUFFIX).a \
libsea$(TWL_LIBSUFFIX).a \ libsea$(TWL_LIBSUFFIX).a \
libacsign$(TWL_LIBSUFFIX).a \
libacsign_enc$(TWL_LIBSUFFIX).a \ libacsign_enc$(TWL_LIBSUFFIX).a \
libnamut$(TWL_LIBSUFFIX).a libnamut$(TWL_LIBSUFFIX).a
@ -94,6 +95,7 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib
MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
GLIBRARIES := $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES))
LDIRT_CLEAN = $(TARGET_TAD) LDIRT_CLEAN = $(TARGET_TAD)
#INSTALL_TARGETS = $(TARGET_TAD) #INSTALL_TARGETS = $(TARGET_TAD)

View File

@ -39,7 +39,7 @@ TWL_ARCHGEN = LIMITED
TITLEID_LO = NINA TITLEID_LO = NINA
TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad
TARGET_BIN = NandFormatterAuto.srl TARGET_BIN = NandInitializerAuto.srl
LCFILE_SPEC = ../../NandInitializer/ARM9.TWL/ARM9-TS.lsf LCFILE_SPEC = ../../NandInitializer/ARM9.TWL/ARM9-TS.lsf
ROM_SPEC = ../../NandInitializer/ARM9.TWL/main.rsf ROM_SPEC = ../../NandInitializer/ARM9.TWL/main.rsf
@ -93,6 +93,7 @@ LLIBRARIES += libes$(TWL_LIBSUFFIX).a \
libboc$(TWL_LIBSUFFIX).a \ libboc$(TWL_LIBSUFFIX).a \
libnam$(TWL_LIBSUFFIX).a \ libnam$(TWL_LIBSUFFIX).a \
libsea$(TWL_LIBSUFFIX).a \ libsea$(TWL_LIBSUFFIX).a \
libacsign$(TWL_LIBSUFFIX).a \
libacsign_enc$(TWL_LIBSUFFIX).a \ libacsign_enc$(TWL_LIBSUFFIX).a \
libnamut$(TWL_LIBSUFFIX).a libnamut$(TWL_LIBSUFFIX).a
@ -101,6 +102,8 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs.gx.demolib
MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
GLIBRARIES := $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES))
LDIRT_CLEAN = $(TARGET_TAD) LDIRT_CLEAN = $(TARGET_TAD)
#INSTALL_TARGETS = $(TARGET_TAD) #INSTALL_TARGETS = $(TARGET_TAD)
#INSTALL_DIR = $(SDK_NMENU_DATADIR) #INSTALL_DIR = $(SDK_NMENU_DATADIR)

View File

@ -32,7 +32,6 @@
#include <sysmenu/boot.h> #include <sysmenu/boot.h>
#include <sysmenu/memorymap.h> #include <sysmenu/memorymap.h>
#include <sysmenu/hotsw.h> #include <sysmenu/hotsw.h>
#include <sysmenu/acsign.h>
#include <sysmenu/mb_loader.h> #include <sysmenu/mb_loader.h>
/* SYSMENU_H_ */ /* SYSMENU_H_ */