From 6f941d89ab49127639e416f4bd1f38792bb01fb6 Mon Sep 17 00:00:00 2001 From: yutaka Date: Wed, 26 Sep 2007 04:59:36 +0000 Subject: [PATCH] =?UTF-8?q?make=20rule=E3=81=AE=E8=A6=8B=E7=9B=B4=E3=81=97?= =?UTF-8?q?=20=E3=83=BB=E4=BB=AE=E3=81=AESRL=E3=82=92=E4=BD=9C=E6=88=90?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= =?UTF-8?q?=20(wram=E5=88=9D=E6=9C=9Fmemorymap=E3=81=AFmakerom.TWL?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=E5=BE=85=E3=81=A1)=20=E3=83=BBaxf?= =?UTF-8?q?=E3=81=A7=E3=81=AF=E3=81=AA=E3=81=8Ftef=E3=82=92=E7=94=9F?= =?UTF-8?q?=E6=88=90=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F=20=E3=83=BB=E6=9C=80=E6=96=B0=E3=81=AET=EF=BD=97?= =?UTF-8?q?=EF=BD=8CSDK=E5=AF=BE=E5=BF=9C?= 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@29 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/buildtools/commondefs | 8 ++--- build/buildtools/modulerules | 30 +++++++++---------- build/nandfirm/nandfirm-loader/ARM7/Makefile | 2 +- build/nandfirm/nandfirm-loader/ARM9/Makefile | 6 ++-- build/nandfirm/nandfirm-loader/Makefile | 20 +++++++------ .../nandfirm/nandfirm-loader/nandfirm.nandsf | 8 ++--- build/nandfirm/nandfirm-print/Makefile | 11 ++++--- .../nandfirm-print/nandfirm-BB.nandsf | 8 ++--- build/norfirm/norfirm-empty/Makefile | 12 ++++---- build/norfirm/norfirm-print/ARM7/Makefile | 2 +- build/norfirm/norfirm-print/ARM9/Makefile | 2 +- build/norfirm/norfirm-print/Makefile | 18 ++++++----- build/norfirm/norfirm-print/norfirm-BB.norsf | 4 +-- 13 files changed, 66 insertions(+), 65 deletions(-) diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index 7e68f8ac..d1ec8358 100644 --- a/build/buildtools/commondefs +++ b/build/buildtools/commondefs @@ -37,7 +37,7 @@ SPACE ?= $(EMPTY) $(EMPTY) # CodeGen Target # # FIRM_PLATFORM = [BB/EVA/TS] -# FIRM_MEMSIZE = [32M/64M] +# FIRM_MEMSIZE = [16M/32M] # FIRM_CODEGEN = [ARM/THUMB] # FIRM_PROC = [ARM9/ARM7] # @@ -45,7 +45,7 @@ SPACE ?= $(EMPTY) $(EMPTY) # FIRM_PLATFORM ?= TS -FIRM_MEMSIZE ?= 32M +FIRM_MEMSIZE ?= 16M FIRM_CODEGEN ?= ARM FIRM_PROC ?= ARM9 FIRM_TARGET ?= APP @@ -209,7 +209,7 @@ MAKEFIRM_RSA_PUBKEY ?= $(FIRM_TOOLSDIR)/openssl/rsa_public.der MAKEFIRM_FLAGS ?= -ifneq ($(filter NORFIRM NANDFIRM GCDFIRM,$(FIRM_TARGET)),) +ifneq ($(filter FIRM GCDFIRM,$(FIRM_TARGET)),) FIRM_STRIP_AXF := TRUE endif @@ -250,7 +250,7 @@ MACRO_FLAGS += -DFIRM_TARGET_$(FIRM_TARGET) #---------------------------------------------------------------------------- # 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 endif diff --git a/build/buildtools/modulerules b/build/buildtools/modulerules index e30e9d8d..5ade6f8e 100644 --- a/build/buildtools/modulerules +++ b/build/buildtools/modulerules @@ -18,10 +18,10 @@ ifndef TWLFIRM_MODULERULES_ -ifdef MAKEFIRM_ARM9 +ifneq ($(MAKEFIRM_ARM9),) MAKEROM_ARM9 = $(MAKEFIRM_ARM9) endif -ifdef MAKEFIRM_ARM7 +ifneq ($(MAKEFIRM_ARM7),) MAKEROM_ARM7 = $(MAKEFIRM_ARM7) endif @@ -72,19 +72,19 @@ $(BINDIR)/$(TARGET_BIN_BASENAME).rbin: $(OBJS) objcopy -I elf32-little -O binary $< $@ # .axf -$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX) -ifeq ($(NITRO_CCTYPE),RVCT) - $(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS) -else - $(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@ -ifeq ($(TWL_PLATFORM),TS) - cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).nef -else # ($(TWL_PLATFORM),BB) -ifdef FIRM_STRIP_AXF - $(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin -endif -endif -endif +#$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX) +#ifeq ($(NITRO_CCTYPE),RVCT) +# $(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS) +#else +# $(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@ +#ifeq ($(TWL_PLATFORM),TS) +# cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).tef +#else # ($(TWL_PLATFORM),BB) +#ifdef FIRM_STRIP_AXF +# $(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin +#endif +#endif +#endif #---------------------------------------------------------------------------- TWLFIRM_MODULERULES_ = TRUE diff --git a/build/nandfirm/nandfirm-loader/ARM7/Makefile b/build/nandfirm/nandfirm-loader/ARM7/Makefile index d1d1b41b..655a7ac3 100644 --- a/build/nandfirm/nandfirm-loader/ARM7/Makefile +++ b/build/nandfirm/nandfirm-loader/ARM7/Makefile @@ -25,7 +25,7 @@ LINCLUDES = ../include #---------------------------------------------------------------------------- -TARGET_BIN = twl_nandfirm7_loader.axf +TARGET_BIN = twl_nandfirm7_loader.tef SRCS = main.c diff --git a/build/nandfirm/nandfirm-loader/ARM9/Makefile b/build/nandfirm/nandfirm-loader/ARM9/Makefile index 1cd39092..ba785bc0 100644 --- a/build/nandfirm/nandfirm-loader/ARM9/Makefile +++ b/build/nandfirm/nandfirm-loader/ARM9/Makefile @@ -24,14 +24,14 @@ LINCLUDES = ../include #---------------------------------------------------------------------------- -TARGET_BIN = twl_nandfirm9_loader.axf +TARGET_BIN = twl_nandfirm9_loader.tef SRCS = main.c CRT0_O = crt0_firm.o -MAKEROM_ARM7 = ../ARM7/bin/ARM7-TS/Release/main.LTD.TWL.sbin -MAKEROM_ARM7_BASE = ../ARM7/bin/ARM7-TS/Release/main +MAKEROM_ARM7 = ../ARM7/bin/ARM7-TS/Release/twl_nandfirm7_loader.sbin +MAKEROM_ARM7_BASE = ../ARM7/bin/ARM7-TS/Release/twl_nandfirm7_loader #LCFILE_TEMPLATE = $(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template diff --git a/build/nandfirm/nandfirm-loader/Makefile b/build/nandfirm/nandfirm-loader/Makefile index f7b6dc94..4edb8959 100644 --- a/build/nandfirm/nandfirm-loader/Makefile +++ b/build/nandfirm/nandfirm-loader/Makefile @@ -19,9 +19,7 @@ FIRM_TARGET = FIRM -TWL_KEYSDIR = $(FIRM_ROOT)/keys/bootrom - -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +TWL_KEYSDIR = $(FIRM_ROOT)/../twl_firmware/bootrom/build/keys #---------------------------------------------------------------------------- @@ -31,19 +29,24 @@ SUBDIRS = \ ARM9 \ wram_regs \ -TARGET_FIRM_BIN = nandfirm_loader.nand +TARGET_FIRM_BIN = nandfirm_loader.nand nandfirm_loader.srl BINDIR = . -MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_nandfirm9_loader.axf -MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_nandfirm7_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.tef MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der LDEPENDS_BIN += wram_regs/wram_regs.rbin +MAKEROM_ARM7_BASE = $(basename $(MAKEFIRM_ARM7)) + NITRO_MAKEROM = TRUE MAKEFIRM_FLAGS += -p FIRM_SPEC = nandfirm.nandsf -LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ - rsa_public.sbin \ +LDIRT_CLEAN += $(TARGETS) \ + $(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 - #===== End of Makefile ===== diff --git a/build/nandfirm/nandfirm-loader/nandfirm.nandsf b/build/nandfirm/nandfirm-loader/nandfirm.nandsf index 35a9c20f..d8920a51 100644 --- a/build/nandfirm/nandfirm-loader/nandfirm.nandsf +++ b/build/nandfirm/nandfirm-loader/nandfirm.nandsf @@ -12,12 +12,12 @@ MIRROR_OFS: 0x80000 DECOMP_PROC : ARM9 # ARM9 or ARM7 ARM9_COMP : FALSE # TRUE or FALSE, should be before ARM9_SBIN -ARM9_SBIN : $(MAKEFIRM_ARM9).sbin -ARM9_ELF : $(MAKEFIRM_ARM9).axf +ARM9_SBIN : $(MAKEFIRM_ARM9).FLX.TWL.sbin +ARM9_ELF : $(MAKEFIRM_ARM9).tef ARM7_COMP : FALSE # TRUE or FALSE, should be before ARM7_SBIN -ARM7_SBIN : $(MAKEFIRM_ARM7).sbin -ARM7_ELF : $(MAKEFIRM_ARM7).axf +ARM7_SBIN : $(MAKEFIRM_ARM7).FLX.TWL.sbin +ARM7_ELF : $(MAKEFIRM_ARM7).tef ARM9_X2 : FALSE # TRUE or FALSE diff --git a/build/nandfirm/nandfirm-print/Makefile b/build/nandfirm/nandfirm-print/Makefile index 6fe02dcb..0b06a8ed 100644 --- a/build/nandfirm/nandfirm-print/Makefile +++ b/build/nandfirm/nandfirm-print/Makefile @@ -17,10 +17,7 @@ #---------------------------------------------------------------------------- -FIRM_TARGET = NORFIRM - - -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +FIRM_TARGET = FIRM #---------------------------------------------------------------------------- @@ -29,8 +26,8 @@ SUBDIRS = ../../norfirm/norfirm-print TARGET_FIRM_BIN = nandfirm_print.nand BINDIR = . -MAKEFIRM_ARM9 = ../../norfirm/norfirm-print/ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.axf -MAKEFIRM_ARM7 = ../../norfirm/norfirm-print/ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_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.tef MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der LDEPENDS_BIN += ../../norfirm/norfirm-print/wram_regs/wram_regs.rbin @@ -41,6 +38,8 @@ FIRM_SPEC = nandfirm-BB.nandsf LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ rsa_public.sbin \ +include $(TWLFIRM_ROOT)/build/buildtools/commondefs + #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) diff --git a/build/nandfirm/nandfirm-print/nandfirm-BB.nandsf b/build/nandfirm/nandfirm-print/nandfirm-BB.nandsf index 2209a8ba..165cc226 100644 --- a/build/nandfirm/nandfirm-print/nandfirm-BB.nandsf +++ b/build/nandfirm/nandfirm-print/nandfirm-BB.nandsf @@ -12,12 +12,12 @@ MIRROR_OFS: 0x80000 DECOMP_PROC : ARM9 # ARM9 or ARM7 ARM9_COMP : FALSE # TRUE or FALSE, should be before ARM9_SBIN -ARM9_SBIN : $(MAKEFIRM_ARM9).sbin -ARM9_ELF : $(MAKEFIRM_ARM9).axf +ARM9_SBIN : $(MAKEFIRM_ARM9).FLX.TWL.sbin +ARM9_ELF : $(MAKEFIRM_ARM9).tef ARM7_COMP : FALSE # TRUE or FALSE, should be before ARM7_SBIN -ARM7_SBIN : $(MAKEFIRM_ARM7).sbin -ARM7_ELF : $(MAKEFIRM_ARM7).axf +ARM7_SBIN : $(MAKEFIRM_ARM7).FLX.TWL.sbin +ARM7_ELF : $(MAKEFIRM_ARM7).tef ARM9_X2 : TRUE # TRUE or FALSE diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile index 8c52883d..a0edd671 100644 --- a/build/norfirm/norfirm-empty/Makefile +++ b/build/norfirm/norfirm-empty/Makefile @@ -17,10 +17,7 @@ #---------------------------------------------------------------------------- -FIRM_TARGET = NORFIRM - - -include $(TWLFIRM_ROOT)/build/buildtools/commondefs +FIRM_TARGET = FIRM #---------------------------------------------------------------------------- @@ -30,8 +27,8 @@ TARGET_FIRM_BIN = norfirm_empty.nor BINDIR = . MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nor.der -MAKEROM_ARM9 = -MAKEROM_ARM7 = +MAKEFIRM_ARM9 = +MAKEFIRM_ARM7 = NITRO_MAKEROM = TRUE MAKEFIRM_FLAGS += -p @@ -40,11 +37,12 @@ FIRM_SPEC = norfirm-BB.norsf LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ rsa_public.sbin \ +include $(TWLFIRM_ROOT)/build/buildtools/commondefs + #---------------------------------------------------------------------------- do-build: $(TARGET_BIN) include $(TWLFIRM_ROOT)/build/buildtools/modulerules - #===== End of Makefile ===== diff --git a/build/norfirm/norfirm-print/ARM7/Makefile b/build/norfirm/norfirm-print/ARM7/Makefile index 1bc6dbf4..4894cd44 100644 --- a/build/norfirm/norfirm-print/ARM7/Makefile +++ b/build/norfirm/norfirm-print/ARM7/Makefile @@ -25,7 +25,7 @@ LINCLUDES = ../include #---------------------------------------------------------------------------- -TARGET_BIN = twl_norfirm7_print.axf +TARGET_BIN = twl_norfirm7_print.tef CRT0_O = crt0_firm.o diff --git a/build/norfirm/norfirm-print/ARM9/Makefile b/build/norfirm/norfirm-print/ARM9/Makefile index 41f64e3f..b392ea12 100644 --- a/build/norfirm/norfirm-print/ARM9/Makefile +++ b/build/norfirm/norfirm-print/ARM9/Makefile @@ -24,7 +24,7 @@ LINCLUDES = ../include #---------------------------------------------------------------------------- -TARGET_BIN = twl_norfirm9_print.axf +TARGET_BIN = twl_norfirm9_print.tef CRT0_O = crt0_firm.o diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile index b820b2a8..183c4a9e 100644 --- a/build/norfirm/norfirm-print/Makefile +++ b/build/norfirm/norfirm-print/Makefile @@ -20,9 +20,6 @@ FIRM_TARGET = FIRM -include $(TWLFIRM_ROOT)/build/buildtools/commondefs - - #---------------------------------------------------------------------------- SUBDIRS = \ @@ -30,19 +27,24 @@ SUBDIRS = \ ARM9 \ wram_regs \ -TARGET_FIRM_BIN = norfirm_print.nor +TARGET_FIRM_BIN = norfirm_print.nor norfirm_print.srl BINDIR = . -MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.axf -MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_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.tef MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nor.der LDEPENDS_BIN += wram_regs/wram_regs.rbin +MAKEROM_ARM7_BASE = $(basename $(MAKEFIRM_ARM7)) + NITRO_MAKEROM = TRUE MAKEFIRM_FLAGS += -p FIRM_SPEC = norfirm-BB.norsf -LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ - rsa_public.sbin \ +LDIRT_CLEAN += $(TARGETS) \ + $(basename $(firstword $(TARGETS))).tlf \ + rsa_public.sbin \ + +include $(TWLFIRM_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- diff --git a/build/norfirm/norfirm-print/norfirm-BB.norsf b/build/norfirm/norfirm-print/norfirm-BB.norsf index 89ceb8d7..a472dc2e 100644 --- a/build/norfirm/norfirm-print/norfirm-BB.norsf +++ b/build/norfirm/norfirm-print/norfirm-BB.norsf @@ -13,11 +13,11 @@ DECOMP_PROC : ARM9 # ARM9 or ARM7 ARM9_COMP : TRUE # TRUE or FALSE, should be before ARM9_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_SBIN : $(MAKEFIRM_ARM7).FLX.TWL.sbin -ARM7_ELF : $(MAKEFIRM_ARM7).axf +ARM7_ELF : $(MAKEFIRM_ARM7).tef NCD_ROMOFS : 0x07fe00