From 0f44b70e2726b0f3b6ce82702e058e20ca552e81 Mon Sep 17 00:00:00 2001 From: nakasima Date: Thu, 29 Jan 2009 10:48:37 +0000 Subject: [PATCH] =?UTF-8?q?ROOT/build=E3=82=92firmware/build=E3=81=B8?= =?UTF-8?q?=E7=A7=BB=E5=8B=95=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@239 b871894f-2f95-9b40-918c-086798483c85 --- trunk/Makefile | 4 ++-- trunk/bootrom/Makefile | 5 +++-- trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile | 4 ++-- trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile | 4 ++-- trunk/bootrom/build/bootrom/thread/ARM11/Makefile | 2 +- trunk/bootrom/build/bootrom/thread/ARM9/Makefile | 2 +- trunk/{ => firmware}/build/Makefile | 0 trunk/{ => firmware}/build/buildsetup/Makefile | 0 trunk/{ => firmware}/build/buildsetup/ioreg/Makefile | 0 .../build/buildsetup/ioreg/header_generator_ioreg.pl | 0 .../build/buildsetup/ioreg/io_register_list.csv | 0 .../buildsetup/ioreg/io_register_list_ne1patch.csv | 0 .../{ => firmware}/build/buildsetup/ioreg_sp/Makefile | 0 .../buildsetup/ioreg_sp/header_generator_ioreg_sp.pl | 0 .../build/buildsetup/ioreg_sp/io_register_list_sp.csv | 0 .../ioreg_sp/io_register_list_sp_mg20patch.csv | 0 .../{ => firmware}/build/buildsetup/versions/Makefile | 0 .../{ => firmware}/build/buildsetup/versions/version.h | 0 trunk/{ => firmware}/build/buildtools/@privatedefs | 0 trunk/{ => firmware}/build/buildtools/_privatedefs | 0 trunk/{ => firmware}/build/buildtools/commondefs | 0 .../build/buildtools/commondefs.cctype.CW | 0 .../build/buildtools/commondefs.cctype.RVCT | 0 .../build/buildtools/commondefs.emtype.ISD | 0 trunk/{ => firmware}/build/buildtools/modulerules | 0 .../build/buildtools/modulerules.add-ins.firm | 0 .../build/buildtools/modulerules.cctype.CW | 0 .../build/buildtools/modulerules.cctype.RVCT | 0 .../build/buildtools/modulerules.emtype.ISD | 0 trunk/{ => firmware}/build/buildtools/modulerules.x86 | 0 trunk/{ => firmware}/build/buildtools/sdk_indent.pl | 0 .../build/buildtools/template/Copyright.Header | 0 .../build/buildtools/template/Function.Header | 0 .../build/buildtools/template/Makefile.BuildSrc | 0 .../build/buildtools/template/Makefile.BuildSrc.ARM7 | 0 .../build/buildtools/template/Makefile.BuildSubdir | 0 trunk/{ => firmware}/build/buildtools/verinfo.cw.cc | 0 trunk/{ => firmware}/build/buildtools/verinfo.cw.ld | 0 trunk/{ => firmware}/build/buildtools/versiondefs | 0 trunk/{ => firmware}/include/ctr/arm_reg.h | 0 trunk/{ => firmware}/include/ctr/hw/ARM11/arm11_reg.h | 0 .../include/ctr/hw/ARM11/mmap_axi_wram.h | 0 .../{ => firmware}/include/ctr/hw/ARM11/mmap_global.h | 0 trunk/{ => firmware}/include/ctr/hw/ARM11/mmu_table.h | 0 trunk/{ => firmware}/include/ctr/hw/ARM11/vfp.h | 0 trunk/{ => firmware}/include/ctr/hw/ARM9/arm9_reg.h | 0 trunk/{ => firmware}/include/ctr/hw/ARM9/mmap_global.h | 0 .../{ => firmware}/include/ctr/hw/ARM9/mmap_prv_wram.h | 0 .../include/ctr/hw/common/arm_reg_common.h | 0 .../{ => firmware}/include/ctr/hw/common/mmap_shared.h | 0 trunk/{ => firmware}/include/ctr/ioreg.h | 0 trunk/{ => firmware}/include/ctr/memorymap.h | 0 trunk/{ => firmware}/include/ctr/memorymap_sp.h | 0 trunk/{ => firmware}/include/ctr/misc.h | 0 trunk/{ => firmware}/include/ctr/os/common/svc.h | 0 trunk/{ => firmware}/include/ctr/os/common/svc_id.h | 0 trunk/{ => firmware}/include/ctr/types.h | 0 trunk/{ => firmware}/include/firm/_ | 0 trunk/{ => firmware}/include/firm/hw/ARM11/mmap_firm.h | 0 trunk/{ => firmware}/include/firm/hw/ARM9/mmap_firm.h | 0 trunk/{ => firmware}/include/readme.txt | 0 trunk/setup | 10 ++++++---- 62 files changed, 17 insertions(+), 14 deletions(-) rename trunk/{ => firmware}/build/Makefile (100%) rename trunk/{ => firmware}/build/buildsetup/Makefile (100%) rename trunk/{ => firmware}/build/buildsetup/ioreg/Makefile (100%) rename trunk/{ => firmware}/build/buildsetup/ioreg/header_generator_ioreg.pl (100%) rename trunk/{ => firmware}/build/buildsetup/ioreg/io_register_list.csv (100%) rename trunk/{ => firmware}/build/buildsetup/ioreg/io_register_list_ne1patch.csv (100%) rename trunk/{ => firmware}/build/buildsetup/ioreg_sp/Makefile (100%) rename trunk/{ => firmware}/build/buildsetup/ioreg_sp/header_generator_ioreg_sp.pl (100%) rename trunk/{ => firmware}/build/buildsetup/ioreg_sp/io_register_list_sp.csv (100%) rename trunk/{ => firmware}/build/buildsetup/ioreg_sp/io_register_list_sp_mg20patch.csv (100%) rename trunk/{ => firmware}/build/buildsetup/versions/Makefile (100%) rename trunk/{ => firmware}/build/buildsetup/versions/version.h (100%) rename trunk/{ => firmware}/build/buildtools/@privatedefs (100%) rename trunk/{ => firmware}/build/buildtools/_privatedefs (100%) rename trunk/{ => firmware}/build/buildtools/commondefs (100%) rename trunk/{ => firmware}/build/buildtools/commondefs.cctype.CW (100%) rename trunk/{ => firmware}/build/buildtools/commondefs.cctype.RVCT (100%) rename trunk/{ => firmware}/build/buildtools/commondefs.emtype.ISD (100%) rename trunk/{ => firmware}/build/buildtools/modulerules (100%) rename trunk/{ => firmware}/build/buildtools/modulerules.add-ins.firm (100%) rename trunk/{ => firmware}/build/buildtools/modulerules.cctype.CW (100%) rename trunk/{ => firmware}/build/buildtools/modulerules.cctype.RVCT (100%) rename trunk/{ => firmware}/build/buildtools/modulerules.emtype.ISD (100%) rename trunk/{ => firmware}/build/buildtools/modulerules.x86 (100%) rename trunk/{ => firmware}/build/buildtools/sdk_indent.pl (100%) rename trunk/{ => firmware}/build/buildtools/template/Copyright.Header (100%) rename trunk/{ => firmware}/build/buildtools/template/Function.Header (100%) rename trunk/{ => firmware}/build/buildtools/template/Makefile.BuildSrc (100%) rename trunk/{ => firmware}/build/buildtools/template/Makefile.BuildSrc.ARM7 (100%) rename trunk/{ => firmware}/build/buildtools/template/Makefile.BuildSubdir (100%) rename trunk/{ => firmware}/build/buildtools/verinfo.cw.cc (100%) rename trunk/{ => firmware}/build/buildtools/verinfo.cw.ld (100%) rename trunk/{ => firmware}/build/buildtools/versiondefs (100%) rename trunk/{ => firmware}/include/ctr/arm_reg.h (100%) rename trunk/{ => firmware}/include/ctr/hw/ARM11/arm11_reg.h (100%) rename trunk/{ => firmware}/include/ctr/hw/ARM11/mmap_axi_wram.h (100%) rename trunk/{ => firmware}/include/ctr/hw/ARM11/mmap_global.h (100%) rename trunk/{ => firmware}/include/ctr/hw/ARM11/mmu_table.h (100%) rename trunk/{ => firmware}/include/ctr/hw/ARM11/vfp.h (100%) rename trunk/{ => firmware}/include/ctr/hw/ARM9/arm9_reg.h (100%) rename trunk/{ => firmware}/include/ctr/hw/ARM9/mmap_global.h (100%) rename trunk/{ => firmware}/include/ctr/hw/ARM9/mmap_prv_wram.h (100%) rename trunk/{ => firmware}/include/ctr/hw/common/arm_reg_common.h (100%) rename trunk/{ => firmware}/include/ctr/hw/common/mmap_shared.h (100%) rename trunk/{ => firmware}/include/ctr/ioreg.h (100%) rename trunk/{ => firmware}/include/ctr/memorymap.h (100%) rename trunk/{ => firmware}/include/ctr/memorymap_sp.h (100%) rename trunk/{ => firmware}/include/ctr/misc.h (100%) rename trunk/{ => firmware}/include/ctr/os/common/svc.h (100%) rename trunk/{ => firmware}/include/ctr/os/common/svc_id.h (100%) rename trunk/{ => firmware}/include/ctr/types.h (100%) rename trunk/{ => firmware}/include/firm/_ (100%) rename trunk/{ => firmware}/include/firm/hw/ARM11/mmap_firm.h (100%) rename trunk/{ => firmware}/include/firm/hw/ARM9/mmap_firm.h (100%) rename trunk/{ => firmware}/include/readme.txt (100%) diff --git a/trunk/Makefile b/trunk/Makefile index 84d5d1f..7b9924a 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -3,7 +3,7 @@ # Project: CtrFirm - build # File: Makefile # -# Copyright 2008 Nintendo. All rights reserved. +# Copyright 2008-2009 Nintendo. All rights reserved. # # These coded instructions, statements, and computer programs contain # proprietary information of Nintendo of America Inc. and/or Nintendo @@ -21,7 +21,7 @@ include $(CTRFIRM_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- SUBDIRS = \ - build \ + firmware \ ifdef RVCT30BIN SUBDIRS += \ diff --git a/trunk/bootrom/Makefile b/trunk/bootrom/Makefile index 8690b91..cf41801 100644 --- a/trunk/bootrom/Makefile +++ b/trunk/bootrom/Makefile @@ -11,8 +11,9 @@ # 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. # -# $Log: $ -# $NoKeywords: $ +# $Date:: $ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- include $(CTRBROM_ROOT)/build/buildtools/commondefs diff --git a/trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile b/trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile index f8af48b..3a7a116 100644 --- a/trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile +++ b/trunk/bootrom/build/bootrom/teg-dev/ARM11/Makefile @@ -38,8 +38,8 @@ SRCS = \ include $(CTRBROM_ROOT)/build/buildtools/commondefs -SRCDIR += $(ROOT)/bootrom/build/libraries/init/ARM11 \ - $(ROOT)/bootrom/build/libraries/init/common \ +SRCDIR += $(BROM_ROOT)/build/libraries/init/ARM11 \ + $(BROM_ROOT)/build/libraries/init/common \ INSTALL_DIR = .. INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN_BASENAME).axf diff --git a/trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile b/trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile index b71f66c..6fb8312 100644 --- a/trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile +++ b/trunk/bootrom/build/bootrom/teg-dev/ARM9/Makefile @@ -40,8 +40,8 @@ SRCS = \ include $(CTRBROM_ROOT)/build/buildtools/commondefs -SRCDIR += $(ROOT)/bootrom/build/libraries/init/ARM9 \ - $(ROOT)/bootrom/build/libraries/init/common \ +SRCDIR += $(BROM_ROOT)/build/libraries/init/ARM9 \ + $(BROM_ROOT)/build/libraries/init/common \ INSTALL_DIR = .. INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN_BASENAME).axf diff --git a/trunk/bootrom/build/bootrom/thread/ARM11/Makefile b/trunk/bootrom/build/bootrom/thread/ARM11/Makefile index a664fa5..19c28b7 100644 --- a/trunk/bootrom/build/bootrom/thread/ARM11/Makefile +++ b/trunk/bootrom/build/bootrom/thread/ARM11/Makefile @@ -33,7 +33,7 @@ SRCS = \ include $(CTRBROM_ROOT)/build/buildtools/commondefs -SRCDIR += $(ROOT)/bootrom/build/tests/thread/ARM11 +SRCDIR += $(BROM_ROOT)/build/tests/thread/ARM11 INSTALL_DIR = .. INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN_BASENAME).axf diff --git a/trunk/bootrom/build/bootrom/thread/ARM9/Makefile b/trunk/bootrom/build/bootrom/thread/ARM9/Makefile index f49250a..0fdf8f1 100644 --- a/trunk/bootrom/build/bootrom/thread/ARM9/Makefile +++ b/trunk/bootrom/build/bootrom/thread/ARM9/Makefile @@ -35,7 +35,7 @@ SRCS = \ include $(CTRBROM_ROOT)/build/buildtools/commondefs -SRCDIR = $(ROOT)/bootrom/build/tests/thread/ARM9 +SRCDIR = $(BROM_ROOT)/build/tests/thread/ARM9 INSTALL_DIR = .. INSTALL_TARGETS = $(BINDIR)/$(TARGET_BIN_BASENAME).axf diff --git a/trunk/build/Makefile b/trunk/firmware/build/Makefile similarity index 100% rename from trunk/build/Makefile rename to trunk/firmware/build/Makefile diff --git a/trunk/build/buildsetup/Makefile b/trunk/firmware/build/buildsetup/Makefile similarity index 100% rename from trunk/build/buildsetup/Makefile rename to trunk/firmware/build/buildsetup/Makefile diff --git a/trunk/build/buildsetup/ioreg/Makefile b/trunk/firmware/build/buildsetup/ioreg/Makefile similarity index 100% rename from trunk/build/buildsetup/ioreg/Makefile rename to trunk/firmware/build/buildsetup/ioreg/Makefile diff --git a/trunk/build/buildsetup/ioreg/header_generator_ioreg.pl b/trunk/firmware/build/buildsetup/ioreg/header_generator_ioreg.pl similarity index 100% rename from trunk/build/buildsetup/ioreg/header_generator_ioreg.pl rename to trunk/firmware/build/buildsetup/ioreg/header_generator_ioreg.pl diff --git a/trunk/build/buildsetup/ioreg/io_register_list.csv b/trunk/firmware/build/buildsetup/ioreg/io_register_list.csv similarity index 100% rename from trunk/build/buildsetup/ioreg/io_register_list.csv rename to trunk/firmware/build/buildsetup/ioreg/io_register_list.csv diff --git a/trunk/build/buildsetup/ioreg/io_register_list_ne1patch.csv b/trunk/firmware/build/buildsetup/ioreg/io_register_list_ne1patch.csv similarity index 100% rename from trunk/build/buildsetup/ioreg/io_register_list_ne1patch.csv rename to trunk/firmware/build/buildsetup/ioreg/io_register_list_ne1patch.csv diff --git a/trunk/build/buildsetup/ioreg_sp/Makefile b/trunk/firmware/build/buildsetup/ioreg_sp/Makefile similarity index 100% rename from trunk/build/buildsetup/ioreg_sp/Makefile rename to trunk/firmware/build/buildsetup/ioreg_sp/Makefile diff --git a/trunk/build/buildsetup/ioreg_sp/header_generator_ioreg_sp.pl b/trunk/firmware/build/buildsetup/ioreg_sp/header_generator_ioreg_sp.pl similarity index 100% rename from trunk/build/buildsetup/ioreg_sp/header_generator_ioreg_sp.pl rename to trunk/firmware/build/buildsetup/ioreg_sp/header_generator_ioreg_sp.pl diff --git a/trunk/build/buildsetup/ioreg_sp/io_register_list_sp.csv b/trunk/firmware/build/buildsetup/ioreg_sp/io_register_list_sp.csv similarity index 100% rename from trunk/build/buildsetup/ioreg_sp/io_register_list_sp.csv rename to trunk/firmware/build/buildsetup/ioreg_sp/io_register_list_sp.csv diff --git a/trunk/build/buildsetup/ioreg_sp/io_register_list_sp_mg20patch.csv b/trunk/firmware/build/buildsetup/ioreg_sp/io_register_list_sp_mg20patch.csv similarity index 100% rename from trunk/build/buildsetup/ioreg_sp/io_register_list_sp_mg20patch.csv rename to trunk/firmware/build/buildsetup/ioreg_sp/io_register_list_sp_mg20patch.csv diff --git a/trunk/build/buildsetup/versions/Makefile b/trunk/firmware/build/buildsetup/versions/Makefile similarity index 100% rename from trunk/build/buildsetup/versions/Makefile rename to trunk/firmware/build/buildsetup/versions/Makefile diff --git a/trunk/build/buildsetup/versions/version.h b/trunk/firmware/build/buildsetup/versions/version.h similarity index 100% rename from trunk/build/buildsetup/versions/version.h rename to trunk/firmware/build/buildsetup/versions/version.h diff --git a/trunk/build/buildtools/@privatedefs b/trunk/firmware/build/buildtools/@privatedefs similarity index 100% rename from trunk/build/buildtools/@privatedefs rename to trunk/firmware/build/buildtools/@privatedefs diff --git a/trunk/build/buildtools/_privatedefs b/trunk/firmware/build/buildtools/_privatedefs similarity index 100% rename from trunk/build/buildtools/_privatedefs rename to trunk/firmware/build/buildtools/_privatedefs diff --git a/trunk/build/buildtools/commondefs b/trunk/firmware/build/buildtools/commondefs similarity index 100% rename from trunk/build/buildtools/commondefs rename to trunk/firmware/build/buildtools/commondefs diff --git a/trunk/build/buildtools/commondefs.cctype.CW b/trunk/firmware/build/buildtools/commondefs.cctype.CW similarity index 100% rename from trunk/build/buildtools/commondefs.cctype.CW rename to trunk/firmware/build/buildtools/commondefs.cctype.CW diff --git a/trunk/build/buildtools/commondefs.cctype.RVCT b/trunk/firmware/build/buildtools/commondefs.cctype.RVCT similarity index 100% rename from trunk/build/buildtools/commondefs.cctype.RVCT rename to trunk/firmware/build/buildtools/commondefs.cctype.RVCT diff --git a/trunk/build/buildtools/commondefs.emtype.ISD b/trunk/firmware/build/buildtools/commondefs.emtype.ISD similarity index 100% rename from trunk/build/buildtools/commondefs.emtype.ISD rename to trunk/firmware/build/buildtools/commondefs.emtype.ISD diff --git a/trunk/build/buildtools/modulerules b/trunk/firmware/build/buildtools/modulerules similarity index 100% rename from trunk/build/buildtools/modulerules rename to trunk/firmware/build/buildtools/modulerules diff --git a/trunk/build/buildtools/modulerules.add-ins.firm b/trunk/firmware/build/buildtools/modulerules.add-ins.firm similarity index 100% rename from trunk/build/buildtools/modulerules.add-ins.firm rename to trunk/firmware/build/buildtools/modulerules.add-ins.firm diff --git a/trunk/build/buildtools/modulerules.cctype.CW b/trunk/firmware/build/buildtools/modulerules.cctype.CW similarity index 100% rename from trunk/build/buildtools/modulerules.cctype.CW rename to trunk/firmware/build/buildtools/modulerules.cctype.CW diff --git a/trunk/build/buildtools/modulerules.cctype.RVCT b/trunk/firmware/build/buildtools/modulerules.cctype.RVCT similarity index 100% rename from trunk/build/buildtools/modulerules.cctype.RVCT rename to trunk/firmware/build/buildtools/modulerules.cctype.RVCT diff --git a/trunk/build/buildtools/modulerules.emtype.ISD b/trunk/firmware/build/buildtools/modulerules.emtype.ISD similarity index 100% rename from trunk/build/buildtools/modulerules.emtype.ISD rename to trunk/firmware/build/buildtools/modulerules.emtype.ISD diff --git a/trunk/build/buildtools/modulerules.x86 b/trunk/firmware/build/buildtools/modulerules.x86 similarity index 100% rename from trunk/build/buildtools/modulerules.x86 rename to trunk/firmware/build/buildtools/modulerules.x86 diff --git a/trunk/build/buildtools/sdk_indent.pl b/trunk/firmware/build/buildtools/sdk_indent.pl similarity index 100% rename from trunk/build/buildtools/sdk_indent.pl rename to trunk/firmware/build/buildtools/sdk_indent.pl diff --git a/trunk/build/buildtools/template/Copyright.Header b/trunk/firmware/build/buildtools/template/Copyright.Header similarity index 100% rename from trunk/build/buildtools/template/Copyright.Header rename to trunk/firmware/build/buildtools/template/Copyright.Header diff --git a/trunk/build/buildtools/template/Function.Header b/trunk/firmware/build/buildtools/template/Function.Header similarity index 100% rename from trunk/build/buildtools/template/Function.Header rename to trunk/firmware/build/buildtools/template/Function.Header diff --git a/trunk/build/buildtools/template/Makefile.BuildSrc b/trunk/firmware/build/buildtools/template/Makefile.BuildSrc similarity index 100% rename from trunk/build/buildtools/template/Makefile.BuildSrc rename to trunk/firmware/build/buildtools/template/Makefile.BuildSrc diff --git a/trunk/build/buildtools/template/Makefile.BuildSrc.ARM7 b/trunk/firmware/build/buildtools/template/Makefile.BuildSrc.ARM7 similarity index 100% rename from trunk/build/buildtools/template/Makefile.BuildSrc.ARM7 rename to trunk/firmware/build/buildtools/template/Makefile.BuildSrc.ARM7 diff --git a/trunk/build/buildtools/template/Makefile.BuildSubdir b/trunk/firmware/build/buildtools/template/Makefile.BuildSubdir similarity index 100% rename from trunk/build/buildtools/template/Makefile.BuildSubdir rename to trunk/firmware/build/buildtools/template/Makefile.BuildSubdir diff --git a/trunk/build/buildtools/verinfo.cw.cc b/trunk/firmware/build/buildtools/verinfo.cw.cc similarity index 100% rename from trunk/build/buildtools/verinfo.cw.cc rename to trunk/firmware/build/buildtools/verinfo.cw.cc diff --git a/trunk/build/buildtools/verinfo.cw.ld b/trunk/firmware/build/buildtools/verinfo.cw.ld similarity index 100% rename from trunk/build/buildtools/verinfo.cw.ld rename to trunk/firmware/build/buildtools/verinfo.cw.ld diff --git a/trunk/build/buildtools/versiondefs b/trunk/firmware/build/buildtools/versiondefs similarity index 100% rename from trunk/build/buildtools/versiondefs rename to trunk/firmware/build/buildtools/versiondefs diff --git a/trunk/include/ctr/arm_reg.h b/trunk/firmware/include/ctr/arm_reg.h similarity index 100% rename from trunk/include/ctr/arm_reg.h rename to trunk/firmware/include/ctr/arm_reg.h diff --git a/trunk/include/ctr/hw/ARM11/arm11_reg.h b/trunk/firmware/include/ctr/hw/ARM11/arm11_reg.h similarity index 100% rename from trunk/include/ctr/hw/ARM11/arm11_reg.h rename to trunk/firmware/include/ctr/hw/ARM11/arm11_reg.h diff --git a/trunk/include/ctr/hw/ARM11/mmap_axi_wram.h b/trunk/firmware/include/ctr/hw/ARM11/mmap_axi_wram.h similarity index 100% rename from trunk/include/ctr/hw/ARM11/mmap_axi_wram.h rename to trunk/firmware/include/ctr/hw/ARM11/mmap_axi_wram.h diff --git a/trunk/include/ctr/hw/ARM11/mmap_global.h b/trunk/firmware/include/ctr/hw/ARM11/mmap_global.h similarity index 100% rename from trunk/include/ctr/hw/ARM11/mmap_global.h rename to trunk/firmware/include/ctr/hw/ARM11/mmap_global.h diff --git a/trunk/include/ctr/hw/ARM11/mmu_table.h b/trunk/firmware/include/ctr/hw/ARM11/mmu_table.h similarity index 100% rename from trunk/include/ctr/hw/ARM11/mmu_table.h rename to trunk/firmware/include/ctr/hw/ARM11/mmu_table.h diff --git a/trunk/include/ctr/hw/ARM11/vfp.h b/trunk/firmware/include/ctr/hw/ARM11/vfp.h similarity index 100% rename from trunk/include/ctr/hw/ARM11/vfp.h rename to trunk/firmware/include/ctr/hw/ARM11/vfp.h diff --git a/trunk/include/ctr/hw/ARM9/arm9_reg.h b/trunk/firmware/include/ctr/hw/ARM9/arm9_reg.h similarity index 100% rename from trunk/include/ctr/hw/ARM9/arm9_reg.h rename to trunk/firmware/include/ctr/hw/ARM9/arm9_reg.h diff --git a/trunk/include/ctr/hw/ARM9/mmap_global.h b/trunk/firmware/include/ctr/hw/ARM9/mmap_global.h similarity index 100% rename from trunk/include/ctr/hw/ARM9/mmap_global.h rename to trunk/firmware/include/ctr/hw/ARM9/mmap_global.h diff --git a/trunk/include/ctr/hw/ARM9/mmap_prv_wram.h b/trunk/firmware/include/ctr/hw/ARM9/mmap_prv_wram.h similarity index 100% rename from trunk/include/ctr/hw/ARM9/mmap_prv_wram.h rename to trunk/firmware/include/ctr/hw/ARM9/mmap_prv_wram.h diff --git a/trunk/include/ctr/hw/common/arm_reg_common.h b/trunk/firmware/include/ctr/hw/common/arm_reg_common.h similarity index 100% rename from trunk/include/ctr/hw/common/arm_reg_common.h rename to trunk/firmware/include/ctr/hw/common/arm_reg_common.h diff --git a/trunk/include/ctr/hw/common/mmap_shared.h b/trunk/firmware/include/ctr/hw/common/mmap_shared.h similarity index 100% rename from trunk/include/ctr/hw/common/mmap_shared.h rename to trunk/firmware/include/ctr/hw/common/mmap_shared.h diff --git a/trunk/include/ctr/ioreg.h b/trunk/firmware/include/ctr/ioreg.h similarity index 100% rename from trunk/include/ctr/ioreg.h rename to trunk/firmware/include/ctr/ioreg.h diff --git a/trunk/include/ctr/memorymap.h b/trunk/firmware/include/ctr/memorymap.h similarity index 100% rename from trunk/include/ctr/memorymap.h rename to trunk/firmware/include/ctr/memorymap.h diff --git a/trunk/include/ctr/memorymap_sp.h b/trunk/firmware/include/ctr/memorymap_sp.h similarity index 100% rename from trunk/include/ctr/memorymap_sp.h rename to trunk/firmware/include/ctr/memorymap_sp.h diff --git a/trunk/include/ctr/misc.h b/trunk/firmware/include/ctr/misc.h similarity index 100% rename from trunk/include/ctr/misc.h rename to trunk/firmware/include/ctr/misc.h diff --git a/trunk/include/ctr/os/common/svc.h b/trunk/firmware/include/ctr/os/common/svc.h similarity index 100% rename from trunk/include/ctr/os/common/svc.h rename to trunk/firmware/include/ctr/os/common/svc.h diff --git a/trunk/include/ctr/os/common/svc_id.h b/trunk/firmware/include/ctr/os/common/svc_id.h similarity index 100% rename from trunk/include/ctr/os/common/svc_id.h rename to trunk/firmware/include/ctr/os/common/svc_id.h diff --git a/trunk/include/ctr/types.h b/trunk/firmware/include/ctr/types.h similarity index 100% rename from trunk/include/ctr/types.h rename to trunk/firmware/include/ctr/types.h diff --git a/trunk/include/firm/_ b/trunk/firmware/include/firm/_ similarity index 100% rename from trunk/include/firm/_ rename to trunk/firmware/include/firm/_ diff --git a/trunk/include/firm/hw/ARM11/mmap_firm.h b/trunk/firmware/include/firm/hw/ARM11/mmap_firm.h similarity index 100% rename from trunk/include/firm/hw/ARM11/mmap_firm.h rename to trunk/firmware/include/firm/hw/ARM11/mmap_firm.h diff --git a/trunk/include/firm/hw/ARM9/mmap_firm.h b/trunk/firmware/include/firm/hw/ARM9/mmap_firm.h similarity index 100% rename from trunk/include/firm/hw/ARM9/mmap_firm.h rename to trunk/firmware/include/firm/hw/ARM9/mmap_firm.h diff --git a/trunk/include/readme.txt b/trunk/firmware/include/readme.txt similarity index 100% rename from trunk/include/readme.txt rename to trunk/firmware/include/readme.txt diff --git a/trunk/setup b/trunk/setup index fdecc8b..9afe27c 100644 --- a/trunk/setup +++ b/trunk/setup @@ -5,15 +5,17 @@ # Please use 'source ./setup'. #---------------------------------------------------------------- -export CTRFIRM_ROOT=`cygpath -m $PWD` -export CTRBROM_ROOT=$CTRFIRM_ROOT/bootrom -export CTRSDK_ROOT=$CTRFIRM_ROOT +export CTRALL_ROOT=`cygpath -m $PWD` +export CTRBROM_ROOT=$CTRALL_ROOT/bootrom +export CTRFIRM_ROOT=$CTRALL_ROOT/firmware +export CTRSDK_ROOT=$CTRALL_ROOT/firmware export CTR_PLATFORM='NE1EMU' export BROM_PLATFORM=$CTR_PLATFORM export CYGPATH_NOCMD='TRUE' -echo "Set CTRFIRM_ROOT: $CTRFIRM_ROOT" +echo "Set CTRALL_ROOT: $CTRALL_ROOT" echo "Set CTRBROM_ROOT: $CTRBROM_ROOT" +echo "Set CTRFIRM_ROOT: $CTRFIRM_ROOT" echo "Set CTRSDK_ROOT: $CTRSDK_ROOT" echo "Set CTR_PLATFORM: $CTR_PLATFORM" echo "Set CYGPATH_NOCMD: $CYGPATH_NOCMD"