From eb8a286e4fba5868d6027e1d37773ef1017833a2 Mon Sep 17 00:00:00 2001 From: yutaka Date: Thu, 8 Nov 2007 07:37:05 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E7=94=A8sr?= =?UTF-8?q?l,=20tlf=E3=82=92ARM9=E4=BB=A5=E4=B8=8B=E3=81=AB=E4=BD=9C?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=20?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0=E6=9C=AC=E4=BD=93=E3=81=AE?= =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=81=ABBUILD=5FTYPE=E3=82=92=E4=BB=98?= =?UTF-8?q?=E5=8A=A0=E3=81=97=E3=81=9F=20(make=20full=E3=81=A7=E3=83=87?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=B0=E7=89=88=E3=81=A0=E3=81=91=E6=AE=8B?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7)?= 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@120 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/nandfirm/menu-launcher/ARM9/Makefile | 7 ++++++- build/nandfirm/menu-launcher/Makefile | 17 ++++++----------- build/nandfirm/nandfirm-print/Makefile | 17 ++++++++--------- build/nandfirm/sdmc-launcher/ARM9/Makefile | 7 ++++++- build/nandfirm/sdmc-launcher/Makefile | 17 ++++++----------- build/norfirm/norfirm-empty/Makefile | 15 ++++++--------- build/norfirm/norfirm-print/ARM9/Makefile | 10 +++++++--- build/norfirm/norfirm-print/Makefile | 17 ++++++----------- 8 files changed, 51 insertions(+), 56 deletions(-) diff --git a/build/nandfirm/menu-launcher/ARM9/Makefile b/build/nandfirm/menu-launcher/ARM9/Makefile index c426b865..be87a7c6 100644 --- a/build/nandfirm/menu-launcher/ARM9/Makefile +++ b/build/nandfirm/menu-launcher/ARM9/Makefile @@ -24,12 +24,17 @@ LINCLUDES = ../include #---------------------------------------------------------------------------- -TARGET_BIN = menu_launcher9.tef +TARGET_BIN = menu_launcher9.srl SRCS = main.c CRT0_O = crt0_firm.o +MAKEROM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher9.tef +MAKEROM_ARM7 = ../ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher7.tef +MAKEROM_ARM7_BASE = $(basename $(MAKEROM_ARM7)) +MAKEROM_FLAGS += -F + #LCFILE_TEMPLATE = $(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template #SRCDIR = # using default diff --git a/build/nandfirm/menu-launcher/Makefile b/build/nandfirm/menu-launcher/Makefile index b4674eb4..05a84ba8 100644 --- a/build/nandfirm/menu-launcher/Makefile +++ b/build/nandfirm/menu-launcher/Makefile @@ -30,22 +30,17 @@ SUBDIRS = \ ARM9 \ wram_regs \ -TARGET_FIRM_BIN = menu_launcher.nand menu_launcher.srl +TARGET_FIRM_BIN = menu_launcher-$(FIRM_BUILD_TYPE).nand BINDIR = . -MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher9.tef -MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher7.tef -MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der -LDEPENDS_BIN += wram_regs/wram_regs.rbin +MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher9.tef +MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/menu_launcher7.tef +MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der +LDEPENDS_BIN += wram_regs/wram_regs.rbin -MAKEROM_ARM7_BASE = $(basename $(MAKEFIRM_ARM7)) -MAKEROM_FLAGS += -F - -NITRO_MAKEROM = TRUE -MAKEFIRM_FLAGS += -p +MAKEFIRM_FLAGS += -p FIRM_SPEC = nandfirm.nandsf LDIRT_CLEAN += $(TARGETS) \ - $(basename $(firstword $(TARGETS))).tlf \ rsa_public.sbin \ include $(TWLIPL_ROOT)/build/buildtools/commondefs diff --git a/build/nandfirm/nandfirm-print/Makefile b/build/nandfirm/nandfirm-print/Makefile index b92d2c11..a859c24e 100644 --- a/build/nandfirm/nandfirm-print/Makefile +++ b/build/nandfirm/nandfirm-print/Makefile @@ -24,19 +24,18 @@ FIRM_TARGET = FIRM SUBDIRS = ../../norfirm/norfirm-print -TARGET_FIRM_BIN = nandfirm_print.nand +TARGET_FIRM_BIN = nandfirm_print-$(FIRM_BUILD_TYPE).nand BINDIR = . -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 +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 -NITRO_MAKEROM = TRUE -MAKEFIRM_FLAGS += -p +MAKEFIRM_FLAGS += -p FIRM_SPEC = nandfirm-BB.nandsf -LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ - rsa_public.sbin \ +LDIRT_CLEAN += $(TARGETS) \ + rsa_public.sbin \ include $(TWLIPL_ROOT)/build/buildtools/commondefs diff --git a/build/nandfirm/sdmc-launcher/ARM9/Makefile b/build/nandfirm/sdmc-launcher/ARM9/Makefile index 8e9e540e..bf5cad3f 100644 --- a/build/nandfirm/sdmc-launcher/ARM9/Makefile +++ b/build/nandfirm/sdmc-launcher/ARM9/Makefile @@ -24,12 +24,17 @@ LINCLUDES = ../include #---------------------------------------------------------------------------- -TARGET_BIN = sdmc_launcher9.tef +TARGET_BIN = sdmc_launcher9.srl SRCS = main.c CRT0_O = crt0_firm.o +MAKEROM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher9.tef +MAKEROM_ARM7 = ../ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher7.tef +MAKEROM_ARM7_BASE = $(basename $(MAKEROM_ARM7)) +MAKEROM_FLAGS += -F + #LCFILE_TEMPLATE = $(FIRM_SPECDIR)/$(FIRM_PROC)-$(FIRM_PLATFORM)-PARTNER.lcf.template #SRCDIR = # using default diff --git a/build/nandfirm/sdmc-launcher/Makefile b/build/nandfirm/sdmc-launcher/Makefile index 565f8a19..7d269450 100644 --- a/build/nandfirm/sdmc-launcher/Makefile +++ b/build/nandfirm/sdmc-launcher/Makefile @@ -30,22 +30,17 @@ SUBDIRS = \ ARM9 \ wram_regs \ -TARGET_FIRM_BIN = sdmc_launcher.nand sdmc_launcher.srl +TARGET_FIRM_BIN = sdmc_launcher-$(FIRM_BUILD_TYPE).nand BINDIR = . -MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher9.tef -MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher7.tef -MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der -LDEPENDS_BIN += wram_regs/wram_regs.rbin +MAKEFIRM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher9.tef +MAKEFIRM_ARM7 = ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/sdmc_launcher7.tef +MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nand.der +LDEPENDS_BIN += wram_regs/wram_regs.rbin -MAKEROM_ARM7_BASE = $(basename $(MAKEFIRM_ARM7)) -MAKEROM_FLAGS += -F - -NITRO_MAKEROM = TRUE -MAKEFIRM_FLAGS += -p +MAKEFIRM_FLAGS += -p FIRM_SPEC = nandfirm.nandsf LDIRT_CLEAN += $(TARGETS) \ - $(basename $(firstword $(TARGETS))).tlf \ rsa_public.sbin \ include $(TWLIPL_ROOT)/build/buildtools/commondefs diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile index 32cfdec7..bfab6142 100644 --- a/build/norfirm/norfirm-empty/Makefile +++ b/build/norfirm/norfirm-empty/Makefile @@ -23,19 +23,16 @@ FIRM_TARGET = FIRM SUBDIRS = \ -TARGET_FIRM_BIN = norfirm_empty.nor -BINDIR = . -MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nor.der - +TARGET_FIRM_BIN = norfirm_empty-$(FIRM_BUILD_TYPE).nor +BINDIR = . MAKEFIRM_ARM9 = MAKEFIRM_ARM7 = - -NITRO_MAKEROM = TRUE -MAKEFIRM_FLAGS += -p +MAKEFIRM_RSA_PRVKEY = $(TWL_KEYSDIR)/rsa/private_nor.der +MAKEFIRM_FLAGS += -p FIRM_SPEC = norfirm-BB.norsf -LDIRT_CLEAN += $(BINDIR)/$(TARGET_BIN) \ - rsa_public.sbin \ +LDIRT_CLEAN += $(TARGETS) \ + rsa_public.sbin \ include $(TWLIPL_ROOT)/build/buildtools/commondefs diff --git a/build/norfirm/norfirm-print/ARM9/Makefile b/build/norfirm/norfirm-print/ARM9/Makefile index 503c9c1f..ab5f4f76 100644 --- a/build/norfirm/norfirm-print/ARM9/Makefile +++ b/build/norfirm/norfirm-print/ARM9/Makefile @@ -24,12 +24,16 @@ LINCLUDES = ../include #---------------------------------------------------------------------------- -TARGET_BIN = twl_norfirm9_print.tef +TARGET_BIN = twl_norfirm9_print.srl + +SRCS = main.c CRT0_O = crt0_firm.o -SRCS = \ - main.c \ +MAKEROM_ARM9 = ARM9/bin/ARM9-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm9_print.tef +MAKEROM_ARM7 = ../ARM7/bin/ARM7-$(FIRM_PLATFORM)$(CODEGEN_ARCH)/$(FIRM_BUILD_DIR)/twl_norfirm7_print.tef +MAKEROM_ARM7_BASE = $(basename $(MAKEROM_ARM7)) +MAKEROM_FLAGS += -F #SRCDIR = # using default #LCFILE = # using default diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile index 0b6a16a7..e9ab1121 100644 --- a/build/norfirm/norfirm-print/Makefile +++ b/build/norfirm/norfirm-print/Makefile @@ -30,22 +30,17 @@ SUBDIRS = \ ARM9 \ wram_regs \ -TARGET_FIRM_BIN = norfirm_print.nor norfirm_print.srl +TARGET_FIRM_BIN = norfirm_print-$(FIRM_BUILD_TYPE).nor BINDIR = . -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 +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)) -MAKEROM_FLAGS += -F - -NITRO_MAKEROM = TRUE -MAKEFIRM_FLAGS += -p +MAKEFIRM_FLAGS += -p FIRM_SPEC = norfirm-BB.norsf LDIRT_CLEAN += $(TARGETS) \ - $(basename $(firstword $(TARGETS))).tlf \ rsa_public.sbin \ include $(TWLIPL_ROOT)/build/buildtools/commondefs