make 3.81対応(tests関連)、

make cleanでファーム全バージョンを消すように修正、
新マイコン対応(tests関連)、
他

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@511 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2008-01-24 04:27:55 +00:00
parent e0577ff3ce
commit 3c4983d1e7
25 changed files with 42 additions and 34 deletions

View File

@ -25,14 +25,22 @@ SPACE ?= $(EMPTY) $(EMPTY)
TWL_KEYSDIR ?= $(SYSMENU_ROOT)/keys/dummy
#----------------------------------------------------------------------------
### TWL-commondefs
#
#include $(TWLSDK_ROOT)/build/buildtools/commondefs
include $(NITROSYSTEM_ROOT)/build/buildtools/commondefs
#----------------------------------------------------------------------------
# TWL-SYSTEM-MENU path settings
#
SYSMENU_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT)))
#SYSMENU_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT)))
SYSMENU_ROOT := $(call eupath,$(TWL_IPL_RED_ROOT))
SYSMENU_BUILDTOOLSDIR := $(SYSMENU_ROOT)/build/buildtools
SYSMENU_INCDIR := $(SYSMENU_ROOT)/include \
$(ROOT)/build/libraries/spi/arm9/include \
$(ROOT)/build/libraries/spi/ARM9/include \
$(ROOT)/build/libraries/mb/common/include
SYSMENU_TOOLSDIR := $(SYSMENU_ROOT)/tools
SYSMENU_COMPONENTSDIR := $(SYSMENU_ROOT)/components
@ -41,13 +49,6 @@ LDEPENDS_LCF += $(SYSMENU_BUILDTOOLSDIR)/commondefs.sysmenu
LDEPENDS_RES += $(SYSMENU_BUILDTOOLSDIR)/commondefs.sysmenu
#----------------------------------------------------------------------------
### TWL-commondefs
#
#include $(TWLSDK_ROOT)/build/buildtools/commondefs
include $(NITROSYSTEM_ROOT)/build/buildtools/commondefs
ifneq ($(TARGET_TAD),)
TARGETS += $(TARGET_TAD)
endif
@ -93,14 +94,17 @@ MAKETAD ?= $(ROOT)/tools/bin/makeTad.pl
### Global Library resettings
GINCLUDES := $(SYSMENU_INCDIR) $(GINCLUDES) $(ES_ROOT)/twl/include
GINCLUDES := $(SYSMENU_INCDIR) $(GINCLUDES)
ifneq ($(ES_ROOT),)
GINCLUDES += $(ES_ROOT)/twl/include
endif
GLIBRARY_DIRS := $(SYSMENU_LIBDIR) $(GLIBRARY_DIRS)
GLIBRARIES := $(SYSMENU_LIBS) $(GLIBRARIES)
#----------------------------------------------------------------------------
# TWLSYSMENU_INSTALL_ROOT
#
SYSMENU_INSTALL_ROOT := $(SYSMENU_ROOT)
SYSMENU_INSTALL_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT)))
SYSMENU_INSTALL_INCDIR := $(SYSMENU_INSTALL_ROOT)/include
SYSMENU_INSTALL_TOOLSDIR := $(SYSMENU_INSTALL_ROOT)/tools
SYSMENU_INSTALL_LIBDIR := $(SYSMENU_INSTALL_ROOT)/lib/$(TWL_LIBTYPE)

View File

@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = gcdfirm.gcdsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.gcd) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -31,7 +31,7 @@ LDEPENDS_BIN += ../../norfirm/norfirm-print/wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = gcdfirm.gcdsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.gcd) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -12,8 +12,8 @@
# in whole or in part, without the prior written consent of Nintendo.
#
# $Date:: $
# $Rev:$
# $Author:$
# $Rev$
# $Author$
#----------------------------------------------------------------------------
@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = gcdfirm.gcdsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.gcd) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = nandfirm.nandsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.nand) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = nandfirm.nandsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.nand) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -31,7 +31,7 @@ LDEPENDS_BIN += ../../norfirm/norfirm-print/wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = nandfirm-BB.nandsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.nand) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = nandfirm.nandsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.nand) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = norfirm.norsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.nor) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEFIRM_FLAGS += -p
FIRM_SPEC = norfirm-BB.norsf
LDIRT_CLEAN += $(TARGETS) \
LDIRT_CLEAN += $(wildcard *.nor) \
rsa_public.sbin \
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

View File

@ -31,7 +31,7 @@ TARGET_BIN = main.srl
ROM_SPEC = main.rsf
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c CooperationA.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -31,7 +31,7 @@ TARGET_BIN = main.srl
ROM_SPEC = main.rsf
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c CooperationB.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -31,7 +31,7 @@ TARGET_BIN = main.srl
ROM_SPEC = main.rsf
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c CooperationC.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -30,7 +30,7 @@ TARGET_BIN = main.srl
LCFILE_SPEC = ARM9-TS.lsf
ROM_SPEC = main.rsf
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c ExecPreLoadedApp.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -54,6 +54,7 @@ Autoload WRAM
libcdc_sp$(LIBSUFFIX).a \
libtpex_sp$(LIBSUFFIX).a \
libmicex_sp$(LIBSUFFIX).a \
libmcu_sp$(LIBSUFFIX).a \
libboot_sp$(LIBSUFFIX).a \
libreboot_sp$(LIBSUFFIX).a \
libcardboot_sp$(LIBSUFFIX).a \

View File

@ -47,6 +47,7 @@ Static $(TARGET_NAME)
libcdc_sp$(LIBSUFFIX).a \
libtpex_sp$(LIBSUFFIX).a \
libmicex_sp$(LIBSUFFIX).a \
libmcu_sp$(LIBSUFFIX).a \
libboot_sp$(LIBSUFFIX).a \
libreboot_sp$(LIBSUFFIX).a \
libcardboot_sp$(LIBSUFFIX).a \

View File

@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf
ROM_SPEC = main.rsf
LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c RelocateChecker.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf
ROM_SPEC = main.rsf
LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c RelocateChecker.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf
ROM_SPEC = main.rsf
LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c RelocateChecker.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf
ROM_SPEC = main.rsf
LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c RelocateChecker.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf
ROM_SPEC = main.rsf
LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c RelocateChecker.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf
ROM_SPEC = main.rsf
LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template
MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc
MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc
SRCS = main.c RelocateChecker.c \
$(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c

View File

@ -27,6 +27,8 @@ TWL_NO_STD_PCHDR = True
# Avoid to build THUMB version object
override TWL_CODEGEN = ARM
override TWL_ARCHGEN = LIMITED
SRCDIR = ../common/src src
INCDIR = ../common/include

View File

@ -83,7 +83,7 @@ MACROS = -I$(ROOT)/build/tools/makerom.TWL \
#INSTALL_DIR = $(TWL_INSTALL_TOOLSDIR)/bin
#INSTALL_TARGETS = $(TARGETS) rom_header.template.sbin
INSTALL_DIR = $(TWL_IPL_RED_ROOT)/tools/bin
INSTALL_DIR = $(SYSMENU_INSTALL_TOOLSDIR)/bin
INSTALL_TARGETS = $(TARGETS)
LDIRT_CLEAN = $(OBJECTS) $(TARGETS) version.h \

View File

@ -83,7 +83,7 @@ MACROS = -I$(ROOT)/build/tools/makerom.TWL \
#INSTALL_DIR = $(TWL_INSTALL_TOOLSDIR)/bin
#INSTALL_TARGETS = $(TARGETS) rom_header.template.sbin
INSTALL_DIR = $(TWL_IPL_RED_ROOT)/tools/bin
INSTALL_DIR = $(SYSMENU_INSTALL_TOOLSDIR)/bin
INSTALL_TARGETS = $(TARGETS)
LDIRT_CLEAN = $(OBJECTS) $(TARGETS) version.h \