diff --git a/trunk/bootrom/build/buildtools/commondefs b/trunk/bootrom/build/buildtools/commondefs index 47e90ab..03ef620 100644 --- a/trunk/bootrom/build/buildtools/commondefs +++ b/trunk/bootrom/build/buildtools/commondefs @@ -205,7 +205,7 @@ endif # BROM_PROMGEN DEFAULT_BROM_ROM_SPEC := $(BROM_SPECDIR)/ROM-$(TWL_PLATFORM).rsf BROM_LCF_MAPHDRS := $(BROM_INCDIR)/brom/hw/$(BROM_PROC)/mmap_brom.h \ - $(BROM_CTRFIRM_INCDIR)/ctr/hw/$(BROM_PROC)/mmap_global.h \ + $(CTR_INCDIR)/ctr/hw/$(BROM_PROC)/mmap_global.h \ $(BROM_CTRFIRM_INCDIR)/firm/hw/$(BROM_PROC)/mmap_firm.h \ ifeq ($(BROM_PROC),ARM11) diff --git a/trunk/firmware/build/buildtools/@privatedefs b/trunk/public/build/buildtools/@privatedefs similarity index 100% rename from trunk/firmware/build/buildtools/@privatedefs rename to trunk/public/build/buildtools/@privatedefs diff --git a/trunk/firmware/build/buildtools/_privatedefs b/trunk/public/build/buildtools/_privatedefs similarity index 100% rename from trunk/firmware/build/buildtools/_privatedefs rename to trunk/public/build/buildtools/_privatedefs diff --git a/trunk/firmware/build/buildtools/commondefs b/trunk/public/build/buildtools/commondefs similarity index 100% rename from trunk/firmware/build/buildtools/commondefs rename to trunk/public/build/buildtools/commondefs diff --git a/trunk/firmware/build/buildtools/commondefs.cctype.CW b/trunk/public/build/buildtools/commondefs.cctype.CW similarity index 100% rename from trunk/firmware/build/buildtools/commondefs.cctype.CW rename to trunk/public/build/buildtools/commondefs.cctype.CW diff --git a/trunk/firmware/build/buildtools/commondefs.cctype.RVCT b/trunk/public/build/buildtools/commondefs.cctype.RVCT similarity index 100% rename from trunk/firmware/build/buildtools/commondefs.cctype.RVCT rename to trunk/public/build/buildtools/commondefs.cctype.RVCT diff --git a/trunk/firmware/build/buildtools/commondefs.emtype.ISD b/trunk/public/build/buildtools/commondefs.emtype.ISD similarity index 100% rename from trunk/firmware/build/buildtools/commondefs.emtype.ISD rename to trunk/public/build/buildtools/commondefs.emtype.ISD diff --git a/trunk/firmware/build/buildtools/modulerules b/trunk/public/build/buildtools/modulerules similarity index 100% rename from trunk/firmware/build/buildtools/modulerules rename to trunk/public/build/buildtools/modulerules diff --git a/trunk/firmware/build/buildtools/modulerules.add-ins.firm b/trunk/public/build/buildtools/modulerules.add-ins.firm similarity index 100% rename from trunk/firmware/build/buildtools/modulerules.add-ins.firm rename to trunk/public/build/buildtools/modulerules.add-ins.firm diff --git a/trunk/firmware/build/buildtools/modulerules.cctype.CW b/trunk/public/build/buildtools/modulerules.cctype.CW similarity index 100% rename from trunk/firmware/build/buildtools/modulerules.cctype.CW rename to trunk/public/build/buildtools/modulerules.cctype.CW diff --git a/trunk/firmware/build/buildtools/modulerules.cctype.RVCT b/trunk/public/build/buildtools/modulerules.cctype.RVCT similarity index 100% rename from trunk/firmware/build/buildtools/modulerules.cctype.RVCT rename to trunk/public/build/buildtools/modulerules.cctype.RVCT diff --git a/trunk/firmware/build/buildtools/modulerules.emtype.ISD b/trunk/public/build/buildtools/modulerules.emtype.ISD similarity index 100% rename from trunk/firmware/build/buildtools/modulerules.emtype.ISD rename to trunk/public/build/buildtools/modulerules.emtype.ISD diff --git a/trunk/firmware/build/buildtools/modulerules.x86 b/trunk/public/build/buildtools/modulerules.x86 similarity index 100% rename from trunk/firmware/build/buildtools/modulerules.x86 rename to trunk/public/build/buildtools/modulerules.x86 diff --git a/trunk/firmware/build/buildtools/sdk_indent.pl b/trunk/public/build/buildtools/sdk_indent.pl similarity index 100% rename from trunk/firmware/build/buildtools/sdk_indent.pl rename to trunk/public/build/buildtools/sdk_indent.pl diff --git a/trunk/firmware/build/buildtools/template/Copyright.Header b/trunk/public/build/buildtools/template/Copyright.Header similarity index 100% rename from trunk/firmware/build/buildtools/template/Copyright.Header rename to trunk/public/build/buildtools/template/Copyright.Header diff --git a/trunk/firmware/build/buildtools/template/Function.Header b/trunk/public/build/buildtools/template/Function.Header similarity index 100% rename from trunk/firmware/build/buildtools/template/Function.Header rename to trunk/public/build/buildtools/template/Function.Header diff --git a/trunk/firmware/build/buildtools/template/Makefile.BuildSrc b/trunk/public/build/buildtools/template/Makefile.BuildSrc similarity index 100% rename from trunk/firmware/build/buildtools/template/Makefile.BuildSrc rename to trunk/public/build/buildtools/template/Makefile.BuildSrc diff --git a/trunk/firmware/build/buildtools/template/Makefile.BuildSrc.ARM7 b/trunk/public/build/buildtools/template/Makefile.BuildSrc.ARM7 similarity index 100% rename from trunk/firmware/build/buildtools/template/Makefile.BuildSrc.ARM7 rename to trunk/public/build/buildtools/template/Makefile.BuildSrc.ARM7 diff --git a/trunk/firmware/build/buildtools/template/Makefile.BuildSubdir b/trunk/public/build/buildtools/template/Makefile.BuildSubdir similarity index 100% rename from trunk/firmware/build/buildtools/template/Makefile.BuildSubdir rename to trunk/public/build/buildtools/template/Makefile.BuildSubdir diff --git a/trunk/firmware/build/buildtools/verinfo.cw.cc b/trunk/public/build/buildtools/verinfo.cw.cc similarity index 100% rename from trunk/firmware/build/buildtools/verinfo.cw.cc rename to trunk/public/build/buildtools/verinfo.cw.cc diff --git a/trunk/firmware/build/buildtools/verinfo.cw.ld b/trunk/public/build/buildtools/verinfo.cw.ld similarity index 100% rename from trunk/firmware/build/buildtools/verinfo.cw.ld rename to trunk/public/build/buildtools/verinfo.cw.ld diff --git a/trunk/firmware/build/buildtools/versiondefs b/trunk/public/build/buildtools/versiondefs similarity index 100% rename from trunk/firmware/build/buildtools/versiondefs rename to trunk/public/build/buildtools/versiondefs diff --git a/trunk/firmware/include/ctr/arm_reg.h b/trunk/public/include/ctr/arm_reg.h similarity index 100% rename from trunk/firmware/include/ctr/arm_reg.h rename to trunk/public/include/ctr/arm_reg.h diff --git a/trunk/firmware/include/ctr/hw/ARM11/arm11_reg.h b/trunk/public/include/ctr/hw/ARM11/arm11_reg.h similarity index 100% rename from trunk/firmware/include/ctr/hw/ARM11/arm11_reg.h rename to trunk/public/include/ctr/hw/ARM11/arm11_reg.h diff --git a/trunk/firmware/include/ctr/hw/ARM11/mmap_axi_wram.h b/trunk/public/include/ctr/hw/ARM11/mmap_axi_wram.h similarity index 100% rename from trunk/firmware/include/ctr/hw/ARM11/mmap_axi_wram.h rename to trunk/public/include/ctr/hw/ARM11/mmap_axi_wram.h diff --git a/trunk/firmware/include/ctr/hw/ARM11/mmap_global.h b/trunk/public/include/ctr/hw/ARM11/mmap_global.h similarity index 100% rename from trunk/firmware/include/ctr/hw/ARM11/mmap_global.h rename to trunk/public/include/ctr/hw/ARM11/mmap_global.h diff --git a/trunk/firmware/include/ctr/hw/ARM11/mmu_table.h b/trunk/public/include/ctr/hw/ARM11/mmu_table.h similarity index 100% rename from trunk/firmware/include/ctr/hw/ARM11/mmu_table.h rename to trunk/public/include/ctr/hw/ARM11/mmu_table.h diff --git a/trunk/firmware/include/ctr/hw/ARM11/vfp.h b/trunk/public/include/ctr/hw/ARM11/vfp.h similarity index 100% rename from trunk/firmware/include/ctr/hw/ARM11/vfp.h rename to trunk/public/include/ctr/hw/ARM11/vfp.h diff --git a/trunk/firmware/include/ctr/hw/ARM9/arm9_reg.h b/trunk/public/include/ctr/hw/ARM9/arm9_reg.h similarity index 100% rename from trunk/firmware/include/ctr/hw/ARM9/arm9_reg.h rename to trunk/public/include/ctr/hw/ARM9/arm9_reg.h diff --git a/trunk/firmware/include/ctr/hw/ARM9/mmap_global.h b/trunk/public/include/ctr/hw/ARM9/mmap_global.h similarity index 100% rename from trunk/firmware/include/ctr/hw/ARM9/mmap_global.h rename to trunk/public/include/ctr/hw/ARM9/mmap_global.h diff --git a/trunk/firmware/include/ctr/hw/ARM9/mmap_prv_wram.h b/trunk/public/include/ctr/hw/ARM9/mmap_prv_wram.h similarity index 100% rename from trunk/firmware/include/ctr/hw/ARM9/mmap_prv_wram.h rename to trunk/public/include/ctr/hw/ARM9/mmap_prv_wram.h diff --git a/trunk/firmware/include/ctr/hw/common/arm_reg_common.h b/trunk/public/include/ctr/hw/common/arm_reg_common.h similarity index 100% rename from trunk/firmware/include/ctr/hw/common/arm_reg_common.h rename to trunk/public/include/ctr/hw/common/arm_reg_common.h diff --git a/trunk/firmware/include/ctr/hw/common/mmap_shared.h b/trunk/public/include/ctr/hw/common/mmap_shared.h similarity index 100% rename from trunk/firmware/include/ctr/hw/common/mmap_shared.h rename to trunk/public/include/ctr/hw/common/mmap_shared.h diff --git a/trunk/firmware/include/ctr/ioreg.h b/trunk/public/include/ctr/ioreg.h similarity index 100% rename from trunk/firmware/include/ctr/ioreg.h rename to trunk/public/include/ctr/ioreg.h diff --git a/trunk/firmware/include/ctr/memorymap.h b/trunk/public/include/ctr/memorymap.h similarity index 100% rename from trunk/firmware/include/ctr/memorymap.h rename to trunk/public/include/ctr/memorymap.h diff --git a/trunk/firmware/include/ctr/memorymap_sp.h b/trunk/public/include/ctr/memorymap_sp.h similarity index 100% rename from trunk/firmware/include/ctr/memorymap_sp.h rename to trunk/public/include/ctr/memorymap_sp.h diff --git a/trunk/firmware/include/ctr/misc.h b/trunk/public/include/ctr/misc.h similarity index 100% rename from trunk/firmware/include/ctr/misc.h rename to trunk/public/include/ctr/misc.h diff --git a/trunk/firmware/include/ctr/os/common/svc.h b/trunk/public/include/ctr/os/common/svc.h similarity index 100% rename from trunk/firmware/include/ctr/os/common/svc.h rename to trunk/public/include/ctr/os/common/svc.h diff --git a/trunk/firmware/include/ctr/os/common/svc_id.h b/trunk/public/include/ctr/os/common/svc_id.h similarity index 100% rename from trunk/firmware/include/ctr/os/common/svc_id.h rename to trunk/public/include/ctr/os/common/svc_id.h diff --git a/trunk/firmware/include/ctr/types.h b/trunk/public/include/ctr/types.h similarity index 100% rename from trunk/firmware/include/ctr/types.h rename to trunk/public/include/ctr/types.h diff --git a/trunk/setup b/trunk/setup index 9afe27c..4c2def9 100644 --- a/trunk/setup +++ b/trunk/setup @@ -8,7 +8,7 @@ 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 CTRSDK_ROOT=$CTRALL_ROOT/public export CTR_PLATFORM='NE1EMU' export BROM_PLATFORM=$CTR_PLATFORM export CYGPATH_NOCMD='TRUE'