From 41dd1f8a735a53532518680a5a948fb28d73af68 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Fri, 9 May 2008 06:45:39 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=AA=E3=83=AA=E3=82=B8=E3=83=8A=E3=83=AB?= =?UTF-8?q?=E3=81=AEarmadiro=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=82=92=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82=EF=BC=88NandInitializer?= =?UTF-8?q?=E3=81=A7=E3=81=AF=E7=89=B9=E3=81=AB=E8=BF=BD=E5=8A=A0=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E3=81=8C=E5=BF=85=E8=A6=81=E3=81=AA=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=82=81=EF=BC=89?= 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@1303 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../NandInitializer/ARM7.TWL/Makefile | 77 ----------------- .../NandInitializer/ARM7.TWL/armadillo.lsf | 84 ------------------- .../NandInitializer/ARM9.TWL/Makefile | 4 +- build/systemMenu_RED/NandInitializer/Makefile | 1 - 4 files changed, 2 insertions(+), 164 deletions(-) delete mode 100644 build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile delete mode 100644 build/systemMenu_RED/NandInitializer/ARM7.TWL/armadillo.lsf diff --git a/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile deleted file mode 100644 index db0a443c..00000000 --- a/build/systemMenu_RED/NandInitializer/ARM7.TWL/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -#! make -f -#---------------------------------------------------------------------------- -# Project: TwlSDK - components - armadillo.TWL -# File: Makefile -# -# Copyright 2008 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$ -#---------------------------------------------------------------------------- - -#============================================================================ -# NandInitializerRedから一部の機能を削除するために定義を追加します。 -MACRO_FLAGS += -DNAND_INITIALIZER_LIMITED_MODE -#============================================================================ - -override TARGET_PLATFORM = TWL -override TWL_PROC = ARM7 -override TWL_ARCHGEN = LIMITED -##override TWL_PLATFORM = TS -TWL_NO_STD_PCHDR = True -##TWL_CODEGEN ?= ALL - -ifndef TWLSDK_NOCRYPTO -#---------------------------------------------------------------------------- - -SRCS = main.c - -TARGET_NAME = armadillo - -TARGET_NEF = $(TARGET_NAME).tef -LCFILE_SPEC = $(TARGET_NAME).lsf -LCFILE_TEMPLATE = ../../NandInitializerRed/ARM7.TWL/$(TARGET_NAME).lcf.template -LDRES_TEMPLATE = ../../NandInitializerRed/ARM7.TWL/$(TARGET_NAME).response.template - -CRT0_O = crt0.SCR.TWL.o - -# スタック不足防止の為、インライン展開せずにコンパイルする -CCFLAGS_OPT = -O4 -inline off - -#---------------------------------------------------------------------------- -include $(TWLSDK_ROOT)/build/buildtools/commondefs - -MACRO_FLAGS += -DSDK_ARM7COMP_LTD -DSDK_SEA - -MAKELCF_FLAGS += -DISDBG_LIBS_TWL='$(if $(ISDBG_LIBS_TWL),$(ISDBG_LIBS_TWL),libstubsistd_sp$(TWL_LIBSUFFIX).a)' \ - -DISDBG_LIBS_NITRO='libstubsisd_sp$(TWL_LIBSUFFIX).a' - -LINCLUDES = ../../NandInitializerRed/common/include \ - ../../NandInitializerRed/ARM7.TWL/include \ - ../common/include $(ROOT)/build/libraries/spi/ARM7/include - -SRCDIR = ../../NandInitializerRed/ARM7.TWL/src - -LLIBRARIES += libwl_sp$(TWL_LIBSUFFIX).a \ - libsdio_sp$(TWL_LIBSUFFIX).a \ - libathdrv_sp$(TWL_LIBSUFFIX).a \ - libwpa_sp$(TWL_LIBSUFFIX).a \ - -LDEPENDS_NEF = $(TWL_LIBS) $(LLIBRARIES) - -do-build: $(TARGETS) - -#---------------------------------------------------------------------------- -include $(TWLSDK_ROOT)/build/buildtools/modulerules - -#---------------------------------------------------------------------------- -endif #ifndef TWLSDK_NOCRYPTO - -#===== End of Makefile ===== diff --git a/build/systemMenu_RED/NandInitializer/ARM7.TWL/armadillo.lsf b/build/systemMenu_RED/NandInitializer/ARM7.TWL/armadillo.lsf deleted file mode 100644 index 68393048..00000000 --- a/build/systemMenu_RED/NandInitializer/ARM7.TWL/armadillo.lsf +++ /dev/null @@ -1,84 +0,0 @@ -#---------------------------------------------------------------------------- -# Project: TwlSDK - components - armadillo.TWL -# File: armadillo.lsf -# -# Copyright 2008 Nintendo. All rights reserved. -# -# These coded insructions, 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$ -#---------------------------------------------------------------------------- -# -# Nitro LCF SPEC FILE -# -#-------- -Static $(TARGET_NAME) -{ - Address 0x02380000 - StackSize 1024 1024 - - Library $(CRT0_O) -} - -#-------- -Ltdautoload SCRWRAM -{ - Address 0x03740000 - - Library libsubpsyscall.a - Library libsyscall_sp.twl.a - Library $(CW_LIBS) - Library $(ISDBG_LIBS_TWL) - Library $(ISDBG_LIBS_NITRO) - - Object * (.etable) - Object $(OBJDIR)/main.o - - Library libsea_sp$(LIBSUFFIX).a - Library libcrypto_sp$(LIBSUFFIX).a - - Library libos_sp$(LIBSUFFIX).a - Library libmi_sp$(LIBSUFFIX).a - Library libstd_sp$(LIBSUFFIX).a - Library libmath_sp$(LIBSUFFIX).a - Library libpxi_sp$(LIBSUFFIX).a - Library libexi_sp$(LIBSUFFIX).a - Library libi2c_sp$(LIBSUFFIX).a - Library libsdio_sp$(LIBSUFFIX).a - Library libpad_sp$(LIBSUFFIX).a - Library libscfg_sp$(LIBSUFFIX).a - Library libmcu_sp$(LIBSUFFIX).a - Library libcdc_sp$(LIBSUFFIX).a - Library libsnd_sp$(LIBSUFFIX).a - Library libsndex_sp$(LIBSUFFIX).a - Library libspi_sp$(LIBSUFFIX).a - Library libpm_sp$(LIBSUFFIX).a - Library libtp_sp$(LIBSUFFIX).a - Library libtpex_sp$(LIBSUFFIX).a - Library libmic_sp$(LIBSUFFIX).a - Library libmicex_sp$(LIBSUFFIX).a - Library libnvram_sp$(LIBSUFFIX).a - Library librtc_sp$(LIBSUFFIX).a - Library libfatfs_sp$(LIBSUFFIX).a -# Library libwm_sp$(LIBSUFFIX).a -# Library libnwm_sp$(LIBSUFFIX).a - Library libwvr_sp$(LIBSUFFIX).a - Library libwl_sp$(LIBSUFFIX).a - Library libwpa_sp$(LIBSUFFIX).a - Library libathdrv_sp$(LIBSUFFIX).a - Library libfs_sp$(LIBSUFFIX).a - Library libcard_sp$(LIBSUFFIX).a - Library libcamera_sp$(LIBSUFFIX).a - - Object * (.wram) - Object * (.ltdwram) - Object * (.rsvwram) - Object * (.main) - Object * (.ltdmain) -} diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile index 66073f5f..fb3e5989 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile @@ -65,8 +65,8 @@ endif LCFILE_SPEC = ../../NandInitializerRed/ARM9.TWL/ARM9-TS.lsf ROM_SPEC = ./main.rsf -MAKEROM_ARM7_BASE = ../ARM7.TWL/bin/$(TWL_BUILDTYPE_ARM7)/armadillo -MAKEROM_ARM7 = $(MAKEROM_ARM7_BASE).$(TWL_ELF_EXT) +MAKEROM_ARM7_BASE = $(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo +MAKEROM_ARM7 = $(MAKEROM_ARM7_BASE).TWL.FLX.sbin SRCS = main.c \ kami_pxi.c \ diff --git a/build/systemMenu_RED/NandInitializer/Makefile b/build/systemMenu_RED/NandInitializer/Makefile index d593101e..3f2e28d3 100644 --- a/build/systemMenu_RED/NandInitializer/Makefile +++ b/build/systemMenu_RED/NandInitializer/Makefile @@ -23,7 +23,6 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs SUBDIRS = \ banner \ - ARM7.TWL \ ARM9.TWL \ #----------------------------------------------------------------------------