make ruleの見直し

・仮のSRLを作成するようにした (wram初期memorymapはmakerom.TWLの修正待ち)
・axfではなくtefを生成するようにした
・最新のTwlSDK対応

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@29 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2007-09-26 04:59:36 +00:00
parent efed8e0210
commit 6f941d89ab
13 changed files with 66 additions and 65 deletions

View File

@ -37,7 +37,7 @@ SPACE ?= $(EMPTY) $(EMPTY)
# CodeGen Target # CodeGen Target
# #
# FIRM_PLATFORM = [BB/EVA/TS] # FIRM_PLATFORM = [BB/EVA/TS]
# FIRM_MEMSIZE = [32M/64M] # FIRM_MEMSIZE = [16M/32M]
# FIRM_CODEGEN = [ARM/THUMB] # FIRM_CODEGEN = [ARM/THUMB]
# FIRM_PROC = [ARM9/ARM7] # FIRM_PROC = [ARM9/ARM7]
# #
@ -45,7 +45,7 @@ SPACE ?= $(EMPTY) $(EMPTY)
# #
FIRM_PLATFORM ?= TS FIRM_PLATFORM ?= TS
FIRM_MEMSIZE ?= 32M FIRM_MEMSIZE ?= 16M
FIRM_CODEGEN ?= ARM FIRM_CODEGEN ?= ARM
FIRM_PROC ?= ARM9 FIRM_PROC ?= ARM9
FIRM_TARGET ?= APP FIRM_TARGET ?= APP
@ -209,7 +209,7 @@ MAKEFIRM_RSA_PUBKEY ?= $(FIRM_TOOLSDIR)/openssl/rsa_public.der
MAKEFIRM_FLAGS ?= MAKEFIRM_FLAGS ?=
ifneq ($(filter NORFIRM NANDFIRM GCDFIRM,$(FIRM_TARGET)),) ifneq ($(filter FIRM GCDFIRM,$(FIRM_TARGET)),)
FIRM_STRIP_AXF := TRUE FIRM_STRIP_AXF := TRUE
endif endif
@ -250,7 +250,7 @@ MACRO_FLAGS += -DFIRM_TARGET_$(FIRM_TARGET)
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Makelcf change for build firmware # Makelcf change for build firmware
# #
ifneq ($(filter NORFIRM NANDFIRM GCDFIRM,$(FIRM_TARGET)),) ifneq ($(filter FIRM GCDFIRM,$(FIRM_TARGET)),)
MAKELCF := $(NITROSDK_ROOT)/tools/bin/makelcf.exe MAKELCF := $(NITROSDK_ROOT)/tools/bin/makelcf.exe
endif endif

View File

@ -18,10 +18,10 @@
ifndef TWLFIRM_MODULERULES_ ifndef TWLFIRM_MODULERULES_
ifdef MAKEFIRM_ARM9 ifneq ($(MAKEFIRM_ARM9),)
MAKEROM_ARM9 = $(MAKEFIRM_ARM9) MAKEROM_ARM9 = $(MAKEFIRM_ARM9)
endif endif
ifdef MAKEFIRM_ARM7 ifneq ($(MAKEFIRM_ARM7),)
MAKEROM_ARM7 = $(MAKEFIRM_ARM7) MAKEROM_ARM7 = $(MAKEFIRM_ARM7)
endif endif
@ -72,19 +72,19 @@ $(BINDIR)/$(TARGET_BIN_BASENAME).rbin: $(OBJS)
objcopy -I elf32-little -O binary $< $@ objcopy -I elf32-little -O binary $< $@
# .axf # .axf
$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX) #$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX)
ifeq ($(NITRO_CCTYPE),RVCT) #ifeq ($(NITRO_CCTYPE),RVCT)
$(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS) # $(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS)
else #else
$(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@ # $(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@
ifeq ($(TWL_PLATFORM),TS) #ifeq ($(TWL_PLATFORM),TS)
cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).nef # cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).tef
else # ($(TWL_PLATFORM),BB) #else # ($(TWL_PLATFORM),BB)
ifdef FIRM_STRIP_AXF #ifdef FIRM_STRIP_AXF
$(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin # $(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin
endif #endif
endif #endif
endif #endif
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
TWLFIRM_MODULERULES_ = TRUE TWLFIRM_MODULERULES_ = TRUE

View File

@ -25,7 +25,7 @@ LINCLUDES = ../include
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
TARGET_BIN = twl_nandfirm7_loader.axf TARGET_BIN = twl_nandfirm7_loader.tef
SRCS = main.c SRCS = main.c

View File

@ -24,14 +24,14 @@ LINCLUDES = ../include
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
TARGET_BIN = twl_nandfirm9_loader.axf TARGET_BIN = twl_nandfirm9_loader.tef
SRCS = main.c SRCS = main.c
CRT0_O = crt0_firm.o CRT0_O = crt0_firm.o
MAKEROM_ARM7 = ../ARM7/bin/ARM7-TS/Release/main.LTD.TWL.sbin MAKEROM_ARM7 = ../ARM7/bin/ARM7-TS/Release/twl_nandfirm7_loader.sbin
MAKEROM_ARM7_BASE = ../ARM7/bin/ARM7-TS/Release/main MAKEROM_ARM7_BASE = ../ARM7/bin/ARM7-TS/Release/twl_nandfirm7_loader
#LCFILE_TEMPLATE = $(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template #LCFILE_TEMPLATE = $(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template

View File

@ -19,9 +19,7 @@
FIRM_TARGET = FIRM FIRM_TARGET = FIRM
TWL_KEYSDIR = $(FIRM_ROOT)/keys/bootrom TWL_KEYSDIR = $(FIRM_ROOT)/../twl_firmware/bootrom/build/keys
include $(TWLFIRM_ROOT)/build/buildtools/commondefs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -31,19 +29,24 @@ SUBDIRS = \
ARM9 \ ARM9 \
wram_regs \ wram_regs \
TARGET_FIRM_BIN = nandfirm_loader.nand TARGET_FIRM_BIN = nandfirm_loader.nand nandfirm_loader.srl
BINDIR = . BINDIR = .
MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_nandfirm9_loader.axf MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_nandfirm9_loader.tef
MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_nandfirm7_loader.axf MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_nandfirm7_loader.tef
MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der
LDEPENDS_BIN += wram_regs/wram_regs.rbin LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEROM_ARM7_BASE = $(basename $(MAKEFIRM_ARM7))
NITRO_MAKEROM = TRUE NITRO_MAKEROM = TRUE
MAKEFIRM_FLAGS += -p MAKEFIRM_FLAGS += -p
FIRM_SPEC = nandfirm.nandsf FIRM_SPEC = nandfirm.nandsf
LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ LDIRT_CLEAN += $(TARGETS) \
rsa_public.sbin \ $(basename $(firstword $(TARGETS))).tlf \
rsa_public.sbin \
include $(TWLFIRM_ROOT)/build/buildtools/commondefs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -51,5 +54,4 @@ do-build: $(TARGET_BIN)
include $(TWLFIRM_ROOT)/build/buildtools/modulerules include $(TWLFIRM_ROOT)/build/buildtools/modulerules
#===== End of Makefile ===== #===== End of Makefile =====

View File

@ -12,12 +12,12 @@ MIRROR_OFS: 0x80000
DECOMP_PROC : ARM9 # ARM9 or ARM7 DECOMP_PROC : ARM9 # ARM9 or ARM7
ARM9_COMP : FALSE # TRUE or FALSE, should be before ARM9_SBIN ARM9_COMP : FALSE # TRUE or FALSE, should be before ARM9_SBIN
ARM9_SBIN : $(MAKEFIRM_ARM9).sbin ARM9_SBIN : $(MAKEFIRM_ARM9).FLX.TWL.sbin
ARM9_ELF : $(MAKEFIRM_ARM9).axf ARM9_ELF : $(MAKEFIRM_ARM9).tef
ARM7_COMP : FALSE # TRUE or FALSE, should be before ARM7_SBIN ARM7_COMP : FALSE # TRUE or FALSE, should be before ARM7_SBIN
ARM7_SBIN : $(MAKEFIRM_ARM7).sbin ARM7_SBIN : $(MAKEFIRM_ARM7).FLX.TWL.sbin
ARM7_ELF : $(MAKEFIRM_ARM7).axf ARM7_ELF : $(MAKEFIRM_ARM7).tef
ARM9_X2 : FALSE # TRUE or FALSE ARM9_X2 : FALSE # TRUE or FALSE

View File

@ -17,10 +17,7 @@
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
FIRM_TARGET = NORFIRM FIRM_TARGET = FIRM
include $(TWLFIRM_ROOT)/build/buildtools/commondefs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -29,8 +26,8 @@ SUBDIRS = ../../norfirm/norfirm-print
TARGET_FIRM_BIN = nandfirm_print.nand TARGET_FIRM_BIN = nandfirm_print.nand
BINDIR = . BINDIR = .
MAKEFIRM_ARM9 = ../../norfirm/norfirm-print/ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.axf MAKEFIRM_ARM9 = ../../norfirm/norfirm-print/ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.tef
MAKEFIRM_ARM7 = ../../norfirm/norfirm-print/ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.axf MAKEFIRM_ARM7 = ../../norfirm/norfirm-print/ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.tef
MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der
LDEPENDS_BIN += ../../norfirm/norfirm-print/wram_regs/wram_regs.rbin LDEPENDS_BIN += ../../norfirm/norfirm-print/wram_regs/wram_regs.rbin
@ -41,6 +38,8 @@ FIRM_SPEC = nandfirm-BB.nandsf
LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \
rsa_public.sbin \ rsa_public.sbin \
include $(TWLFIRM_ROOT)/build/buildtools/commondefs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
do-build: $(TARGET_BIN) do-build: $(TARGET_BIN)

View File

@ -12,12 +12,12 @@ MIRROR_OFS: 0x80000
DECOMP_PROC : ARM9 # ARM9 or ARM7 DECOMP_PROC : ARM9 # ARM9 or ARM7
ARM9_COMP : FALSE # TRUE or FALSE, should be before ARM9_SBIN ARM9_COMP : FALSE # TRUE or FALSE, should be before ARM9_SBIN
ARM9_SBIN : $(MAKEFIRM_ARM9).sbin ARM9_SBIN : $(MAKEFIRM_ARM9).FLX.TWL.sbin
ARM9_ELF : $(MAKEFIRM_ARM9).axf ARM9_ELF : $(MAKEFIRM_ARM9).tef
ARM7_COMP : FALSE # TRUE or FALSE, should be before ARM7_SBIN ARM7_COMP : FALSE # TRUE or FALSE, should be before ARM7_SBIN
ARM7_SBIN : $(MAKEFIRM_ARM7).sbin ARM7_SBIN : $(MAKEFIRM_ARM7).FLX.TWL.sbin
ARM7_ELF : $(MAKEFIRM_ARM7).axf ARM7_ELF : $(MAKEFIRM_ARM7).tef
ARM9_X2 : TRUE # TRUE or FALSE ARM9_X2 : TRUE # TRUE or FALSE

View File

@ -17,10 +17,7 @@
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
FIRM_TARGET = NORFIRM FIRM_TARGET = FIRM
include $(TWLFIRM_ROOT)/build/buildtools/commondefs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -30,8 +27,8 @@ TARGET_FIRM_BIN = norfirm_empty.nor
BINDIR = . BINDIR = .
MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nor.der MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nor.der
MAKEROM_ARM9 = MAKEFIRM_ARM9 =
MAKEROM_ARM7 = MAKEFIRM_ARM7 =
NITRO_MAKEROM = TRUE NITRO_MAKEROM = TRUE
MAKEFIRM_FLAGS += -p MAKEFIRM_FLAGS += -p
@ -40,11 +37,12 @@ FIRM_SPEC = norfirm-BB.norsf
LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \
rsa_public.sbin \ rsa_public.sbin \
include $(TWLFIRM_ROOT)/build/buildtools/commondefs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
do-build: $(TARGET_BIN) do-build: $(TARGET_BIN)
include $(TWLFIRM_ROOT)/build/buildtools/modulerules include $(TWLFIRM_ROOT)/build/buildtools/modulerules
#===== End of Makefile ===== #===== End of Makefile =====

View File

@ -25,7 +25,7 @@ LINCLUDES = ../include
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
TARGET_BIN = twl_norfirm7_print.axf TARGET_BIN = twl_norfirm7_print.tef
CRT0_O = crt0_firm.o CRT0_O = crt0_firm.o

View File

@ -24,7 +24,7 @@ LINCLUDES = ../include
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
TARGET_BIN = twl_norfirm9_print.axf TARGET_BIN = twl_norfirm9_print.tef
CRT0_O = crt0_firm.o CRT0_O = crt0_firm.o

View File

@ -20,9 +20,6 @@
FIRM_TARGET = FIRM FIRM_TARGET = FIRM
include $(TWLFIRM_ROOT)/build/buildtools/commondefs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
SUBDIRS = \ SUBDIRS = \
@ -30,19 +27,24 @@ SUBDIRS = \
ARM9 \ ARM9 \
wram_regs \ wram_regs \
TARGET_FIRM_BIN = norfirm_print.nor TARGET_FIRM_BIN = norfirm_print.nor norfirm_print.srl
BINDIR = . BINDIR = .
MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.axf MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.tef
MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.axf MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.tef
MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nor.der MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nor.der
LDEPENDS_BIN += wram_regs/wram_regs.rbin LDEPENDS_BIN += wram_regs/wram_regs.rbin
MAKEROM_ARM7_BASE = $(basename $(MAKEFIRM_ARM7))
NITRO_MAKEROM = TRUE NITRO_MAKEROM = TRUE
MAKEFIRM_FLAGS += -p MAKEFIRM_FLAGS += -p
FIRM_SPEC = norfirm-BB.norsf FIRM_SPEC = norfirm-BB.norsf
LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ LDIRT_CLEAN += $(TARGETS) \
rsa_public.sbin \ $(basename $(firstword $(TARGETS))).tlf \
rsa_public.sbin \
include $(TWLFIRM_ROOT)/build/buildtools/commondefs
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------

View File

@ -13,11 +13,11 @@ DECOMP_PROC : ARM9 # ARM9 or ARM7
ARM9_COMP : TRUE # TRUE or FALSE, should be before ARM9_SBIN ARM9_COMP : TRUE # TRUE or FALSE, should be before ARM9_SBIN
ARM9_SBIN : $(MAKEFIRM_ARM9).FLX.TWL.sbin ARM9_SBIN : $(MAKEFIRM_ARM9).FLX.TWL.sbin
ARM9_ELF : $(MAKEFIRM_ARM9).axf ARM9_ELF : $(MAKEFIRM_ARM9).tef
ARM7_COMP : TRUE # TRUE or FALSE, should be before ARM7_SBIN ARM7_COMP : TRUE # TRUE or FALSE, should be before ARM7_SBIN
ARM7_SBIN : $(MAKEFIRM_ARM7).FLX.TWL.sbin ARM7_SBIN : $(MAKEFIRM_ARM7).FLX.TWL.sbin
ARM7_ELF : $(MAKEFIRM_ARM7).axf ARM7_ELF : $(MAKEFIRM_ARM7).tef
NCD_ROMOFS : 0x07fe00 NCD_ROMOFS : 0x07fe00