From bd5689f0f609e61386493eff7b193dc3570cf54f Mon Sep 17 00:00:00 2001 From: nakasima Date: Tue, 2 Dec 2008 10:36:08 +0000 Subject: [PATCH] =?UTF-8?q?PROM=E5=8C=96=E3=81=B8=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@63 b871894f-2f95-9b40-918c-086798483c85 --- .../build/bootrom/ctr_bootrom/Makefile | 3 +- .../build/bootrom/ctr_bootrom/rom/Makefile | 4 -- .../build/bootrom/ctr_bootrom/rom/crt0.c | 18 ++++--- .../include/brom/hw/common/mmap_prom.h | 42 +++++++++++++++ .../buildtools/modulerules.add-ins.twldll | 54 ------------------- 5 files changed, 55 insertions(+), 66 deletions(-) create mode 100644 trunk/bootrom/include/brom/hw/common/mmap_prom.h delete mode 100644 trunk/build/buildtools/modulerules.add-ins.twldll diff --git a/trunk/bootrom/build/bootrom/ctr_bootrom/Makefile b/trunk/bootrom/build/bootrom/ctr_bootrom/Makefile index f2ca6a8..75a0861 100644 --- a/trunk/bootrom/build/bootrom/ctr_bootrom/Makefile +++ b/trunk/bootrom/build/bootrom/ctr_bootrom/Makefile @@ -24,8 +24,7 @@ include $(CTRBROM_ROOT)/build/buildtools/commondefs SUBDIRS = \ ARM11 \ ARM9 \ - -# rom \ + rom \ #---------------------------------------------------------------------------- diff --git a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile index 94ead54..7546cba 100644 --- a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile +++ b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile @@ -24,11 +24,7 @@ LINCLUDES = ../include #---------------------------------------------------------------------------- -ifeq ($(EXO_PLATFORM),DSTEG) -TARGET_BIN = twl_bootrom_dsteg.exo -else TARGET_BIN = twl_bootrom.exo -endif CRT0_O = diff --git a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/crt0.c b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/crt0.c index df91897..aa3bf18 100644 --- a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/crt0.c +++ b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/crt0.c @@ -1,8 +1,8 @@ /*---------------------------------------------------------------------------* - Project: TwlBrom - bootrom - init + Project: CtrBrom - bootrom - init File: crt0.c - Copyright 2007 Nintendo. All rights reserved. + Copyright 2008 Nintendo. All rights reserved. These coded instructions, statements, and computer programs contain proprietary information of Nintendo of America Inc. and/or Nintendo @@ -14,8 +14,9 @@ $Rev$ $Author$ *---------------------------------------------------------------------------*/ -#include -#include +#include +#include +#include /*---------------------------------------------------------------------------* Name: _start @@ -30,6 +31,11 @@ asm void _start( void ) { PRESERVE8 - INCBIN ../ARM9/bin/BROM_BUILDTYPE_ARM11/twl_bootrom11.padbin - INCBIN ../ARM7/bin/BROM_BUILDTYPE_ARM9/twl_bootrom9.padbin + EXPORT CTR_BROM_ARM11 + EXPORT CTR_BROM_ARM9 + +CTR_BROM_ARM11 + INCBIN ../ARM11/bin/BROM_BUILDTYPE_ARM11/ctr_bootrom11.padbin +CTR_BROM_ARM9 + INCBIN ../ARM9/bin/BROM_BUILDTYPE_ARM9/ctr_bootrom9.padbin } diff --git a/trunk/bootrom/include/brom/hw/common/mmap_prom.h b/trunk/bootrom/include/brom/hw/common/mmap_prom.h new file mode 100644 index 0000000..66b7c43 --- /dev/null +++ b/trunk/bootrom/include/brom/hw/common/mmap_prom.h @@ -0,0 +1,42 @@ +/*---------------------------------------------------------------------------* + Project: CtrBrom - HW - include + File: mmap_prom.h + + 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$ + *---------------------------------------------------------------------------*/ +#ifndef BROM_HW_COMMON_MMAP_PROM_H_ +#define BROM_HW_COMMON_MMAP_PROM_H_ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +//----------------------------- PROM +#define HW_PROM 0x00000000 +#define HW_PROM_END (HW_PROM + HW_PROM_SIZE) +#define HW_PROM_SIZE 0x00020000 + +#define HW_PROM_ARM11 HW_PROM +#define HW_PROM_ARM11_END (HW_PROM_ARM9 + HW_PROM_ARM9_SIZE) +#define HW_PROM_ARM11_SIZE 0x00010000 +#define HW_PROM_ARM9 HW_PROM_ARM9_END +#define HW_PROM_ARM9_END (HW_PROM_ARM7 + HW_PROM_ARM7_SIZE) +#define HW_PROM_ARM9_SIZE 0x00010000 + +#ifdef __cplusplus +} /* extern "C" */ +#endif +/* BROM_HW_COMMON_MMAP_PROM_H_ */ +#endif diff --git a/trunk/build/buildtools/modulerules.add-ins.twldll b/trunk/build/buildtools/modulerules.add-ins.twldll deleted file mode 100644 index 2a464b1..0000000 --- a/trunk/build/buildtools/modulerules.add-ins.twldll +++ /dev/null @@ -1,54 +0,0 @@ -#! make -f -#---------------------------------------------------------------------------- -# Project: CtrFirm - modulerules - common rules for build system -# File: modulerules -# -# 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$ -#---------------------------------------------------------------------------- -ifndef TWLDLL_MODULERULES_ - -#---------------------------------------------------------------------------- - -#MakefileでDLL_FILESを定義しておくとmake dllでstaticsymlist.cができます - -DLL_LIBS ?= $(addprefix $(TWL_LIBDIR)/,$(addsuffix $(TWL_LIBSUFFIX).a,$(DLL_FILES))) -NODBG_LIBS ?= $(addprefix $(TWL_LIBDIR)/,$(addsuffix $(TWL_LIBSUFFIX).nodbg.a,$(DLL_FILES))) -STATIC_LIBS ?= $(addprefix $(TWL_LIBDIR)/,$(TWL_LIBS)) - -.PHONY: dll - -dll: - @$(MAKE_SUBDIR) - @$(ECHO_CURDIR) -ifdef DLL_FILES - $(foreach DLLFILE, $(DLL_LIBS), \ - $(TWLSDK_ROOT)/tools/stripdebug/stripdebug.exe -o $(subst .a,.nodbg.a,$(DLLFILE)) $(DLLFILE);) - - $(TWLSDK_ROOT)/tools/makelst/makelst.exe -o $(SRCDIR)/staticsymlist.c \ - -static $(STATIC_LIBS) \ - -dll $(NODBG_LIBS) -endif - - -# -# $(foreach DLLFILE, $(DLL_LIBS), \ -# $(TWLSDK_ROOT)/tools/makelst/makelst.exe -o staticsymlist.c \ -# -static $(STATIC_LIBS) \ -# -dll $(TWL_LIBDIR)/$(DLLFILE) -#) -# - -#---------------------------------------------------------------------------- -TWLDLL_MODULERULES_ = TRUE -endif # TWLDLL_MODULERULES_ -#----- End of modulerules -----