diff --git a/Makefile b/Makefile index 2e3302b9d..7fbc96576 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ thermosphere: $(MAKE) -C thermosphere all exosphere: thermosphere - $(MAKE) -C exosphere2 all + $(MAKE) -C exosphere all stratosphere: exosphere libraries $(MAKE) -C stratosphere all @@ -120,11 +120,11 @@ dist: dist-no-debug cp sept/sept-primary/sept-primary.elf atmosphere-$(AMSVER)-debug/sept-primary.elf cp sept/sept-secondary/sept-secondary.elf atmosphere-$(AMSVER)-debug/sept-secondary.elf cp sept/sept-secondary/key_derivation/key_derivation.elf atmosphere-$(AMSVER)-debug/sept-secondary-key-derivation.elf - cp exosphere2/loader_stub/loader_stub.elf atmosphere-$(AMSVER)-debug/exosphere-loader-stub.elf - cp exosphere2/program/program.elf atmosphere-$(AMSVER)-debug/exosphere-program.elf - cp exosphere2/warmboot/warmboot.elf atmosphere-$(AMSVER)-debug/exosphere-warmboot.elf - cp exosphere2/program/sc7fw/sc7fw.elf atmosphere-$(AMSVER)-debug/exosphere-sc7fw.elf - cp exosphere2/program/rebootstub/rebootstub.elf atmosphere-$(AMSVER)-debug/exosphere-rebootstub.elf + cp exosphere/loader_stub/loader_stub.elf atmosphere-$(AMSVER)-debug/exosphere-loader-stub.elf + cp exosphere/program/program.elf atmosphere-$(AMSVER)-debug/exosphere-program.elf + cp exosphere/warmboot/warmboot.elf atmosphere-$(AMSVER)-debug/exosphere-warmboot.elf + cp exosphere/program/sc7fw/sc7fw.elf atmosphere-$(AMSVER)-debug/exosphere-sc7fw.elf + cp exosphere/program/rebootstub/rebootstub.elf atmosphere-$(AMSVER)-debug/exosphere-rebootstub.elf cp mesosphere/kernel_ldr/kernel_ldr.elf atmosphere-$(AMSVER)-debug/kernel_ldr.elf cp stratosphere/ams_mitm/ams_mitm.elf atmosphere-$(AMSVER)-debug/ams_mitm.elf cp stratosphere/boot/boot.elf atmosphere-$(AMSVER)-debug/boot.elf diff --git a/exosphere2/Makefile b/exosphere/Makefile similarity index 100% rename from exosphere2/Makefile rename to exosphere/Makefile diff --git a/exosphere2/loader_stub/Makefile b/exosphere/loader_stub/Makefile similarity index 100% rename from exosphere2/loader_stub/Makefile rename to exosphere/loader_stub/Makefile diff --git a/exosphere2/loader_stub/loader_stub.ld b/exosphere/loader_stub/loader_stub.ld similarity index 100% rename from exosphere2/loader_stub/loader_stub.ld rename to exosphere/loader_stub/loader_stub.ld diff --git a/exosphere2/loader_stub/loader_stub.specs b/exosphere/loader_stub/loader_stub.specs similarity index 100% rename from exosphere2/loader_stub/loader_stub.specs rename to exosphere/loader_stub/loader_stub.specs diff --git a/exosphere2/loader_stub/source/secmon_loader_error.cpp b/exosphere/loader_stub/source/secmon_loader_error.cpp similarity index 100% rename from exosphere2/loader_stub/source/secmon_loader_error.cpp rename to exosphere/loader_stub/source/secmon_loader_error.cpp diff --git a/exosphere2/loader_stub/source/secmon_loader_error.hpp b/exosphere/loader_stub/source/secmon_loader_error.hpp similarity index 100% rename from exosphere2/loader_stub/source/secmon_loader_error.hpp rename to exosphere/loader_stub/source/secmon_loader_error.hpp diff --git a/exosphere2/loader_stub/source/secmon_loader_main.cpp b/exosphere/loader_stub/source/secmon_loader_main.cpp similarity index 100% rename from exosphere2/loader_stub/source/secmon_loader_main.cpp rename to exosphere/loader_stub/source/secmon_loader_main.cpp diff --git a/exosphere2/loader_stub/source/secmon_loader_uncompress.cpp b/exosphere/loader_stub/source/secmon_loader_uncompress.cpp similarity index 100% rename from exosphere2/loader_stub/source/secmon_loader_uncompress.cpp rename to exosphere/loader_stub/source/secmon_loader_uncompress.cpp diff --git a/exosphere2/loader_stub/source/secmon_loader_uncompress.hpp b/exosphere/loader_stub/source/secmon_loader_uncompress.hpp similarity index 100% rename from exosphere2/loader_stub/source/secmon_loader_uncompress.hpp rename to exosphere/loader_stub/source/secmon_loader_uncompress.hpp diff --git a/exosphere2/loader_stub/source/start.s b/exosphere/loader_stub/source/start.s similarity index 100% rename from exosphere2/loader_stub/source/start.s rename to exosphere/loader_stub/source/start.s diff --git a/exosphere2/program/Makefile b/exosphere/program/Makefile similarity index 100% rename from exosphere2/program/Makefile rename to exosphere/program/Makefile diff --git a/exosphere2/program/program.ld b/exosphere/program/program.ld similarity index 100% rename from exosphere2/program/program.ld rename to exosphere/program/program.ld diff --git a/exosphere2/program/program.specs b/exosphere/program/program.specs similarity index 100% rename from exosphere2/program/program.specs rename to exosphere/program/program.specs diff --git a/exosphere2/program/rebootstub/Makefile b/exosphere/program/rebootstub/Makefile similarity index 100% rename from exosphere2/program/rebootstub/Makefile rename to exosphere/program/rebootstub/Makefile diff --git a/exosphere2/program/rebootstub/rebootstub.ld b/exosphere/program/rebootstub/rebootstub.ld similarity index 100% rename from exosphere2/program/rebootstub/rebootstub.ld rename to exosphere/program/rebootstub/rebootstub.ld diff --git a/exosphere2/program/rebootstub/rebootstub.specs b/exosphere/program/rebootstub/rebootstub.specs similarity index 100% rename from exosphere2/program/rebootstub/rebootstub.specs rename to exosphere/program/rebootstub/rebootstub.specs diff --git a/exosphere2/program/rebootstub/source/rebootstub_exception_vectors.s b/exosphere/program/rebootstub/source/rebootstub_exception_vectors.s similarity index 100% rename from exosphere2/program/rebootstub/source/rebootstub_exception_vectors.s rename to exosphere/program/rebootstub/source/rebootstub_exception_vectors.s diff --git a/exosphere2/program/rebootstub/source/rebootstub_main.s b/exosphere/program/rebootstub/source/rebootstub_main.s similarity index 100% rename from exosphere2/program/rebootstub/source/rebootstub_main.s rename to exosphere/program/rebootstub/source/rebootstub_main.s diff --git a/exosphere2/program/rebootstub/source/rebootstub_power_off.cpp b/exosphere/program/rebootstub/source/rebootstub_power_off.cpp similarity index 100% rename from exosphere2/program/rebootstub/source/rebootstub_power_off.cpp rename to exosphere/program/rebootstub/source/rebootstub_power_off.cpp diff --git a/exosphere2/program/sc7fw/Makefile b/exosphere/program/sc7fw/Makefile similarity index 100% rename from exosphere2/program/sc7fw/Makefile rename to exosphere/program/sc7fw/Makefile diff --git a/exosphere2/program/sc7fw/sc7fw.ld b/exosphere/program/sc7fw/sc7fw.ld similarity index 100% rename from exosphere2/program/sc7fw/sc7fw.ld rename to exosphere/program/sc7fw/sc7fw.ld diff --git a/exosphere2/program/sc7fw/sc7fw.specs b/exosphere/program/sc7fw/sc7fw.specs similarity index 100% rename from exosphere2/program/sc7fw/sc7fw.specs rename to exosphere/program/sc7fw/sc7fw.specs diff --git a/exosphere2/program/sc7fw/source/sc7fw_dram.cpp b/exosphere/program/sc7fw/source/sc7fw_dram.cpp similarity index 100% rename from exosphere2/program/sc7fw/source/sc7fw_dram.cpp rename to exosphere/program/sc7fw/source/sc7fw_dram.cpp diff --git a/exosphere2/program/sc7fw/source/sc7fw_dram.hpp b/exosphere/program/sc7fw/source/sc7fw_dram.hpp similarity index 100% rename from exosphere2/program/sc7fw/source/sc7fw_dram.hpp rename to exosphere/program/sc7fw/source/sc7fw_dram.hpp diff --git a/exosphere2/program/sc7fw/source/sc7fw_exception_vectors.s b/exosphere/program/sc7fw/source/sc7fw_exception_vectors.s similarity index 100% rename from exosphere2/program/sc7fw/source/sc7fw_exception_vectors.s rename to exosphere/program/sc7fw/source/sc7fw_exception_vectors.s diff --git a/exosphere2/program/sc7fw/source/sc7fw_main.cpp b/exosphere/program/sc7fw/source/sc7fw_main.cpp similarity index 100% rename from exosphere2/program/sc7fw/source/sc7fw_main.cpp rename to exosphere/program/sc7fw/source/sc7fw_main.cpp diff --git a/exosphere2/program/sc7fw/source/sc7fw_start.s b/exosphere/program/sc7fw/source/sc7fw_start.s similarity index 100% rename from exosphere2/program/sc7fw/source/sc7fw_start.s rename to exosphere/program/sc7fw/source/sc7fw_start.s diff --git a/exosphere2/program/sc7fw/source/sc7fw_util.hpp b/exosphere/program/sc7fw/source/sc7fw_util.hpp similarity index 100% rename from exosphere2/program/sc7fw/source/sc7fw_util.hpp rename to exosphere/program/sc7fw/source/sc7fw_util.hpp diff --git a/exosphere2/program/sc7fw/source/sc7fw_util_asm.s b/exosphere/program/sc7fw/source/sc7fw_util_asm.s similarity index 100% rename from exosphere2/program/sc7fw/source/sc7fw_util_asm.s rename to exosphere/program/sc7fw/source/sc7fw_util_asm.s diff --git a/exosphere2/program/source/boot/secmon_boot.hpp b/exosphere/program/source/boot/secmon_boot.hpp similarity index 100% rename from exosphere2/program/source/boot/secmon_boot.hpp rename to exosphere/program/source/boot/secmon_boot.hpp diff --git a/exosphere2/program/source/boot/secmon_boot_cache.cpp b/exosphere/program/source/boot/secmon_boot_cache.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_boot_cache.cpp rename to exosphere/program/source/boot/secmon_boot_cache.cpp diff --git a/exosphere2/program/source/boot/secmon_boot_cache.hpp b/exosphere/program/source/boot/secmon_boot_cache.hpp similarity index 100% rename from exosphere2/program/source/boot/secmon_boot_cache.hpp rename to exosphere/program/source/boot/secmon_boot_cache.hpp diff --git a/exosphere2/program/source/boot/secmon_boot_config.cpp b/exosphere/program/source/boot/secmon_boot_config.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_boot_config.cpp rename to exosphere/program/source/boot/secmon_boot_config.cpp diff --git a/exosphere2/program/source/boot/secmon_boot_functions.cpp b/exosphere/program/source/boot/secmon_boot_functions.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_boot_functions.cpp rename to exosphere/program/source/boot/secmon_boot_functions.cpp diff --git a/exosphere2/program/source/boot/secmon_boot_functions.hpp b/exosphere/program/source/boot/secmon_boot_functions.hpp similarity index 100% rename from exosphere2/program/source/boot/secmon_boot_functions.hpp rename to exosphere/program/source/boot/secmon_boot_functions.hpp diff --git a/exosphere2/program/source/boot/secmon_boot_key_data.s b/exosphere/program/source/boot/secmon_boot_key_data.s similarity index 100% rename from exosphere2/program/source/boot/secmon_boot_key_data.s rename to exosphere/program/source/boot/secmon_boot_key_data.s diff --git a/exosphere2/program/source/boot/secmon_boot_rsa.cpp b/exosphere/program/source/boot/secmon_boot_rsa.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_boot_rsa.cpp rename to exosphere/program/source/boot/secmon_boot_rsa.cpp diff --git a/exosphere2/program/source/boot/secmon_boot_setup.cpp b/exosphere/program/source/boot/secmon_boot_setup.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_boot_setup.cpp rename to exosphere/program/source/boot/secmon_boot_setup.cpp diff --git a/exosphere2/program/source/boot/secmon_crt0.s b/exosphere/program/source/boot/secmon_crt0.s similarity index 100% rename from exosphere2/program/source/boot/secmon_crt0.s rename to exosphere/program/source/boot/secmon_crt0.s diff --git a/exosphere2/program/source/boot/secmon_crt0_cpp.cpp b/exosphere/program/source/boot/secmon_crt0_cpp.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_crt0_cpp.cpp rename to exosphere/program/source/boot/secmon_crt0_cpp.cpp diff --git a/exosphere2/program/source/boot/secmon_main.cpp b/exosphere/program/source/boot/secmon_main.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_main.cpp rename to exosphere/program/source/boot/secmon_main.cpp diff --git a/exosphere2/program/source/boot/secmon_make_page_table.cpp b/exosphere/program/source/boot/secmon_make_page_table.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_make_page_table.cpp rename to exosphere/program/source/boot/secmon_make_page_table.cpp diff --git a/exosphere2/program/source/boot/secmon_package2.cpp b/exosphere/program/source/boot/secmon_package2.cpp similarity index 100% rename from exosphere2/program/source/boot/secmon_package2.cpp rename to exosphere/program/source/boot/secmon_package2.cpp diff --git a/exosphere2/program/source/boot/secmon_size_data.s b/exosphere/program/source/boot/secmon_size_data.s similarity index 100% rename from exosphere2/program/source/boot/secmon_size_data.s rename to exosphere/program/source/boot/secmon_size_data.s diff --git a/exosphere2/program/source/secmon_cache.cpp b/exosphere/program/source/secmon_cache.cpp similarity index 100% rename from exosphere2/program/source/secmon_cache.cpp rename to exosphere/program/source/secmon_cache.cpp diff --git a/exosphere2/program/source/secmon_cache.hpp b/exosphere/program/source/secmon_cache.hpp similarity index 100% rename from exosphere2/program/source/secmon_cache.hpp rename to exosphere/program/source/secmon_cache.hpp diff --git a/exosphere2/program/source/secmon_cache.inc b/exosphere/program/source/secmon_cache.inc similarity index 100% rename from exosphere2/program/source/secmon_cache.inc rename to exosphere/program/source/secmon_cache.inc diff --git a/exosphere2/program/source/secmon_cache_impl.inc b/exosphere/program/source/secmon_cache_impl.inc similarity index 100% rename from exosphere2/program/source/secmon_cache_impl.inc rename to exosphere/program/source/secmon_cache_impl.inc diff --git a/exosphere2/program/source/secmon_cpu_context.cpp b/exosphere/program/source/secmon_cpu_context.cpp similarity index 100% rename from exosphere2/program/source/secmon_cpu_context.cpp rename to exosphere/program/source/secmon_cpu_context.cpp diff --git a/exosphere2/program/source/secmon_cpu_context.hpp b/exosphere/program/source/secmon_cpu_context.hpp similarity index 100% rename from exosphere2/program/source/secmon_cpu_context.hpp rename to exosphere/program/source/secmon_cpu_context.hpp diff --git a/exosphere2/program/source/secmon_error.cpp b/exosphere/program/source/secmon_error.cpp similarity index 100% rename from exosphere2/program/source/secmon_error.cpp rename to exosphere/program/source/secmon_error.cpp diff --git a/exosphere2/program/source/secmon_error.hpp b/exosphere/program/source/secmon_error.hpp similarity index 100% rename from exosphere2/program/source/secmon_error.hpp rename to exosphere/program/source/secmon_error.hpp diff --git a/exosphere2/program/source/secmon_exception_vectors.s b/exosphere/program/source/secmon_exception_vectors.s similarity index 100% rename from exosphere2/program/source/secmon_exception_vectors.s rename to exosphere/program/source/secmon_exception_vectors.s diff --git a/exosphere2/program/source/secmon_interrupt_handler.cpp b/exosphere/program/source/secmon_interrupt_handler.cpp similarity index 100% rename from exosphere2/program/source/secmon_interrupt_handler.cpp rename to exosphere/program/source/secmon_interrupt_handler.cpp diff --git a/exosphere2/program/source/secmon_interrupt_handler.hpp b/exosphere/program/source/secmon_interrupt_handler.hpp similarity index 100% rename from exosphere2/program/source/secmon_interrupt_handler.hpp rename to exosphere/program/source/secmon_interrupt_handler.hpp diff --git a/exosphere2/program/source/secmon_key_storage.cpp b/exosphere/program/source/secmon_key_storage.cpp similarity index 100% rename from exosphere2/program/source/secmon_key_storage.cpp rename to exosphere/program/source/secmon_key_storage.cpp diff --git a/exosphere2/program/source/secmon_key_storage.hpp b/exosphere/program/source/secmon_key_storage.hpp similarity index 100% rename from exosphere2/program/source/secmon_key_storage.hpp rename to exosphere/program/source/secmon_key_storage.hpp diff --git a/exosphere2/program/source/secmon_map.cpp b/exosphere/program/source/secmon_map.cpp similarity index 100% rename from exosphere2/program/source/secmon_map.cpp rename to exosphere/program/source/secmon_map.cpp diff --git a/exosphere2/program/source/secmon_map.hpp b/exosphere/program/source/secmon_map.hpp similarity index 100% rename from exosphere2/program/source/secmon_map.hpp rename to exosphere/program/source/secmon_map.hpp diff --git a/exosphere2/program/source/secmon_misc.cpp b/exosphere/program/source/secmon_misc.cpp similarity index 100% rename from exosphere2/program/source/secmon_misc.cpp rename to exosphere/program/source/secmon_misc.cpp diff --git a/exosphere2/program/source/secmon_misc.hpp b/exosphere/program/source/secmon_misc.hpp similarity index 100% rename from exosphere2/program/source/secmon_misc.hpp rename to exosphere/program/source/secmon_misc.hpp diff --git a/exosphere2/program/source/secmon_page_mapper.cpp b/exosphere/program/source/secmon_page_mapper.cpp similarity index 100% rename from exosphere2/program/source/secmon_page_mapper.cpp rename to exosphere/program/source/secmon_page_mapper.cpp diff --git a/exosphere2/program/source/secmon_page_mapper.hpp b/exosphere/program/source/secmon_page_mapper.hpp similarity index 100% rename from exosphere2/program/source/secmon_page_mapper.hpp rename to exosphere/program/source/secmon_page_mapper.hpp diff --git a/exosphere2/program/source/secmon_setup.cpp b/exosphere/program/source/secmon_setup.cpp similarity index 100% rename from exosphere2/program/source/secmon_setup.cpp rename to exosphere/program/source/secmon_setup.cpp diff --git a/exosphere2/program/source/secmon_setup.hpp b/exosphere/program/source/secmon_setup.hpp similarity index 100% rename from exosphere2/program/source/secmon_setup.hpp rename to exosphere/program/source/secmon_setup.hpp diff --git a/exosphere2/program/source/secmon_setup_warm.cpp b/exosphere/program/source/secmon_setup_warm.cpp similarity index 100% rename from exosphere2/program/source/secmon_setup_warm.cpp rename to exosphere/program/source/secmon_setup_warm.cpp diff --git a/exosphere2/program/source/secmon_spinlock.hpp b/exosphere/program/source/secmon_spinlock.hpp similarity index 100% rename from exosphere2/program/source/secmon_spinlock.hpp rename to exosphere/program/source/secmon_spinlock.hpp diff --git a/exosphere2/program/source/secmon_spinlock.s b/exosphere/program/source/secmon_spinlock.s similarity index 100% rename from exosphere2/program/source/secmon_spinlock.s rename to exosphere/program/source/secmon_spinlock.s diff --git a/exosphere2/program/source/secmon_stack_warm.s b/exosphere/program/source/secmon_stack_warm.s similarity index 100% rename from exosphere2/program/source/secmon_stack_warm.s rename to exosphere/program/source/secmon_stack_warm.s diff --git a/exosphere2/program/source/secmon_start_virtual.s b/exosphere/program/source/secmon_start_virtual.s similarity index 100% rename from exosphere2/program/source/secmon_start_virtual.s rename to exosphere/program/source/secmon_start_virtual.s diff --git a/exosphere2/program/source/secmon_start_warm.s b/exosphere/program/source/secmon_start_warm.s similarity index 100% rename from exosphere2/program/source/secmon_start_warm.s rename to exosphere/program/source/secmon_start_warm.s diff --git a/exosphere2/program/source/secmon_user_power_management.cpp b/exosphere/program/source/secmon_user_power_management.cpp similarity index 100% rename from exosphere2/program/source/secmon_user_power_management.cpp rename to exosphere/program/source/secmon_user_power_management.cpp diff --git a/exosphere2/program/source/secmon_user_power_management.hpp b/exosphere/program/source/secmon_user_power_management.hpp similarity index 100% rename from exosphere2/program/source/secmon_user_power_management.hpp rename to exosphere/program/source/secmon_user_power_management.hpp diff --git a/exosphere2/program/source/smc/secmon_define_access_table.inc b/exosphere/program/source/smc/secmon_define_access_table.inc similarity index 100% rename from exosphere2/program/source/smc/secmon_define_access_table.inc rename to exosphere/program/source/smc/secmon_define_access_table.inc diff --git a/exosphere2/program/source/smc/secmon_define_mc01_access_table.inc b/exosphere/program/source/smc/secmon_define_mc01_access_table.inc similarity index 100% rename from exosphere2/program/source/smc/secmon_define_mc01_access_table.inc rename to exosphere/program/source/smc/secmon_define_mc01_access_table.inc diff --git a/exosphere2/program/source/smc/secmon_define_mc_access_table.inc b/exosphere/program/source/smc/secmon_define_mc_access_table.inc similarity index 100% rename from exosphere2/program/source/smc/secmon_define_mc_access_table.inc rename to exosphere/program/source/smc/secmon_define_mc_access_table.inc diff --git a/exosphere2/program/source/smc/secmon_define_pmc_access_table.inc b/exosphere/program/source/smc/secmon_define_pmc_access_table.inc similarity index 100% rename from exosphere2/program/source/smc/secmon_define_pmc_access_table.inc rename to exosphere/program/source/smc/secmon_define_pmc_access_table.inc diff --git a/exosphere2/program/source/smc/secmon_mc01_access_table_data.inc b/exosphere/program/source/smc/secmon_mc01_access_table_data.inc similarity index 100% rename from exosphere2/program/source/smc/secmon_mc01_access_table_data.inc rename to exosphere/program/source/smc/secmon_mc01_access_table_data.inc diff --git a/exosphere2/program/source/smc/secmon_mc_access_table_data.inc b/exosphere/program/source/smc/secmon_mc_access_table_data.inc similarity index 100% rename from exosphere2/program/source/smc/secmon_mc_access_table_data.inc rename to exosphere/program/source/smc/secmon_mc_access_table_data.inc diff --git a/exosphere2/program/source/smc/secmon_pmc_access_table_data.inc b/exosphere/program/source/smc/secmon_pmc_access_table_data.inc similarity index 100% rename from exosphere2/program/source/smc/secmon_pmc_access_table_data.inc rename to exosphere/program/source/smc/secmon_pmc_access_table_data.inc diff --git a/exosphere2/program/source/smc/secmon_random_cache.cpp b/exosphere/program/source/smc/secmon_random_cache.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_random_cache.cpp rename to exosphere/program/source/smc/secmon_random_cache.cpp diff --git a/exosphere2/program/source/smc/secmon_random_cache.hpp b/exosphere/program/source/smc/secmon_random_cache.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_random_cache.hpp rename to exosphere/program/source/smc/secmon_random_cache.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_aes.cpp b/exosphere/program/source/smc/secmon_smc_aes.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_aes.cpp rename to exosphere/program/source/smc/secmon_smc_aes.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_aes.hpp b/exosphere/program/source/smc/secmon_smc_aes.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_aes.hpp rename to exosphere/program/source/smc/secmon_smc_aes.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_carveout.cpp b/exosphere/program/source/smc/secmon_smc_carveout.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_carveout.cpp rename to exosphere/program/source/smc/secmon_smc_carveout.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_carveout.hpp b/exosphere/program/source/smc/secmon_smc_carveout.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_carveout.hpp rename to exosphere/program/source/smc/secmon_smc_carveout.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_common.hpp b/exosphere/program/source/smc/secmon_smc_common.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_common.hpp rename to exosphere/program/source/smc/secmon_smc_common.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_cpu_asm.s b/exosphere/program/source/smc/secmon_smc_cpu_asm.s similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_cpu_asm.s rename to exosphere/program/source/smc/secmon_smc_cpu_asm.s diff --git a/exosphere2/program/source/smc/secmon_smc_device_unique_data.cpp b/exosphere/program/source/smc/secmon_smc_device_unique_data.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_device_unique_data.cpp rename to exosphere/program/source/smc/secmon_smc_device_unique_data.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_device_unique_data.hpp b/exosphere/program/source/smc/secmon_smc_device_unique_data.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_device_unique_data.hpp rename to exosphere/program/source/smc/secmon_smc_device_unique_data.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_error.cpp b/exosphere/program/source/smc/secmon_smc_error.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_error.cpp rename to exosphere/program/source/smc/secmon_smc_error.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_error.hpp b/exosphere/program/source/smc/secmon_smc_error.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_error.hpp rename to exosphere/program/source/smc/secmon_smc_error.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_handler.cpp b/exosphere/program/source/smc/secmon_smc_handler.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_handler.cpp rename to exosphere/program/source/smc/secmon_smc_handler.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_handler.hpp b/exosphere/program/source/smc/secmon_smc_handler.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_handler.hpp rename to exosphere/program/source/smc/secmon_smc_handler.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_info.cpp b/exosphere/program/source/smc/secmon_smc_info.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_info.cpp rename to exosphere/program/source/smc/secmon_smc_info.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_info.hpp b/exosphere/program/source/smc/secmon_smc_info.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_info.hpp rename to exosphere/program/source/smc/secmon_smc_info.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_memory_access.cpp b/exosphere/program/source/smc/secmon_smc_memory_access.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_memory_access.cpp rename to exosphere/program/source/smc/secmon_smc_memory_access.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_memory_access.hpp b/exosphere/program/source/smc/secmon_smc_memory_access.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_memory_access.hpp rename to exosphere/program/source/smc/secmon_smc_memory_access.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_power_management.cpp b/exosphere/program/source/smc/secmon_smc_power_management.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_power_management.cpp rename to exosphere/program/source/smc/secmon_smc_power_management.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_power_management.hpp b/exosphere/program/source/smc/secmon_smc_power_management.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_power_management.hpp rename to exosphere/program/source/smc/secmon_smc_power_management.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_random.cpp b/exosphere/program/source/smc/secmon_smc_random.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_random.cpp rename to exosphere/program/source/smc/secmon_smc_random.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_random.hpp b/exosphere/program/source/smc/secmon_smc_random.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_random.hpp rename to exosphere/program/source/smc/secmon_smc_random.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_register_access.cpp b/exosphere/program/source/smc/secmon_smc_register_access.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_register_access.cpp rename to exosphere/program/source/smc/secmon_smc_register_access.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_register_access.hpp b/exosphere/program/source/smc/secmon_smc_register_access.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_register_access.hpp rename to exosphere/program/source/smc/secmon_smc_register_access.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_result.cpp b/exosphere/program/source/smc/secmon_smc_result.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_result.cpp rename to exosphere/program/source/smc/secmon_smc_result.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_result.hpp b/exosphere/program/source/smc/secmon_smc_result.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_result.hpp rename to exosphere/program/source/smc/secmon_smc_result.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_rsa.cpp b/exosphere/program/source/smc/secmon_smc_rsa.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_rsa.cpp rename to exosphere/program/source/smc/secmon_smc_rsa.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_rsa.hpp b/exosphere/program/source/smc/secmon_smc_rsa.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_rsa.hpp rename to exosphere/program/source/smc/secmon_smc_rsa.hpp diff --git a/exosphere2/program/source/smc/secmon_smc_se_lock.cpp b/exosphere/program/source/smc/secmon_smc_se_lock.cpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_se_lock.cpp rename to exosphere/program/source/smc/secmon_smc_se_lock.cpp diff --git a/exosphere2/program/source/smc/secmon_smc_se_lock.hpp b/exosphere/program/source/smc/secmon_smc_se_lock.hpp similarity index 100% rename from exosphere2/program/source/smc/secmon_smc_se_lock.hpp rename to exosphere/program/source/smc/secmon_smc_se_lock.hpp diff --git a/exosphere2/program/split_program.py b/exosphere/program/split_program.py similarity index 100% rename from exosphere2/program/split_program.py rename to exosphere/program/split_program.py diff --git a/exosphere2/warmboot/Makefile b/exosphere/warmboot/Makefile similarity index 100% rename from exosphere2/warmboot/Makefile rename to exosphere/warmboot/Makefile diff --git a/exosphere2/warmboot/source/warmboot_bootrom_workaround.cpp b/exosphere/warmboot/source/warmboot_bootrom_workaround.cpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_bootrom_workaround.cpp rename to exosphere/warmboot/source/warmboot_bootrom_workaround.cpp diff --git a/exosphere2/warmboot/source/warmboot_bootrom_workaround.hpp b/exosphere/warmboot/source/warmboot_bootrom_workaround.hpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_bootrom_workaround.hpp rename to exosphere/warmboot/source/warmboot_bootrom_workaround.hpp diff --git a/exosphere2/warmboot/source/warmboot_clkrst.cpp b/exosphere/warmboot/source/warmboot_clkrst.cpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_clkrst.cpp rename to exosphere/warmboot/source/warmboot_clkrst.cpp diff --git a/exosphere2/warmboot/source/warmboot_clkrst.hpp b/exosphere/warmboot/source/warmboot_clkrst.hpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_clkrst.hpp rename to exosphere/warmboot/source/warmboot_clkrst.hpp diff --git a/exosphere2/warmboot/source/warmboot_cpu_cluster.cpp b/exosphere/warmboot/source/warmboot_cpu_cluster.cpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_cpu_cluster.cpp rename to exosphere/warmboot/source/warmboot_cpu_cluster.cpp diff --git a/exosphere2/warmboot/source/warmboot_cpu_cluster.hpp b/exosphere/warmboot/source/warmboot_cpu_cluster.hpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_cpu_cluster.hpp rename to exosphere/warmboot/source/warmboot_cpu_cluster.hpp diff --git a/exosphere2/warmboot/source/warmboot_dram.cpp b/exosphere/warmboot/source/warmboot_dram.cpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_dram.cpp rename to exosphere/warmboot/source/warmboot_dram.cpp diff --git a/exosphere2/warmboot/source/warmboot_dram.hpp b/exosphere/warmboot/source/warmboot_dram.hpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_dram.hpp rename to exosphere/warmboot/source/warmboot_dram.hpp diff --git a/exosphere2/warmboot/source/warmboot_exception_vectors.s b/exosphere/warmboot/source/warmboot_exception_vectors.s similarity index 100% rename from exosphere2/warmboot/source/warmboot_exception_vectors.s rename to exosphere/warmboot/source/warmboot_exception_vectors.s diff --git a/exosphere2/warmboot/source/warmboot_main.cpp b/exosphere/warmboot/source/warmboot_main.cpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_main.cpp rename to exosphere/warmboot/source/warmboot_main.cpp diff --git a/exosphere2/warmboot/source/warmboot_main.hpp b/exosphere/warmboot/source/warmboot_main.hpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_main.hpp rename to exosphere/warmboot/source/warmboot_main.hpp diff --git a/exosphere2/warmboot/source/warmboot_misc.cpp b/exosphere/warmboot/source/warmboot_misc.cpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_misc.cpp rename to exosphere/warmboot/source/warmboot_misc.cpp diff --git a/exosphere2/warmboot/source/warmboot_misc.hpp b/exosphere/warmboot/source/warmboot_misc.hpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_misc.hpp rename to exosphere/warmboot/source/warmboot_misc.hpp diff --git a/exosphere2/warmboot/source/warmboot_secure_monitor.cpp b/exosphere/warmboot/source/warmboot_secure_monitor.cpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_secure_monitor.cpp rename to exosphere/warmboot/source/warmboot_secure_monitor.cpp diff --git a/exosphere2/warmboot/source/warmboot_secure_monitor.hpp b/exosphere/warmboot/source/warmboot_secure_monitor.hpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_secure_monitor.hpp rename to exosphere/warmboot/source/warmboot_secure_monitor.hpp diff --git a/exosphere2/warmboot/source/warmboot_start.s b/exosphere/warmboot/source/warmboot_start.s similarity index 100% rename from exosphere2/warmboot/source/warmboot_start.s rename to exosphere/warmboot/source/warmboot_start.s diff --git a/exosphere2/warmboot/source/warmboot_util.hpp b/exosphere/warmboot/source/warmboot_util.hpp similarity index 100% rename from exosphere2/warmboot/source/warmboot_util.hpp rename to exosphere/warmboot/source/warmboot_util.hpp diff --git a/exosphere2/warmboot/source/warmboot_util_asm.s b/exosphere/warmboot/source/warmboot_util_asm.s similarity index 100% rename from exosphere2/warmboot/source/warmboot_util_asm.s rename to exosphere/warmboot/source/warmboot_util_asm.s diff --git a/exosphere2/warmboot/warmboot.ld b/exosphere/warmboot/warmboot.ld similarity index 100% rename from exosphere2/warmboot/warmboot.ld rename to exosphere/warmboot/warmboot.ld diff --git a/exosphere2/warmboot/warmboot.specs b/exosphere/warmboot/warmboot.specs similarity index 100% rename from exosphere2/warmboot/warmboot.specs rename to exosphere/warmboot/warmboot.specs diff --git a/fusee/fusee-primary/Makefile b/fusee/fusee-primary/Makefile index dd3828792..c471da0d4 100644 --- a/fusee/fusee-primary/Makefile +++ b/fusee/fusee-primary/Makefile @@ -77,7 +77,7 @@ export TOPDIR := $(CURDIR) export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ $(foreach dir,$(DATA),$(CURDIR)/$(dir)) \ - $(AMS)/exosphere2/program/rebootstub + $(AMS)/exosphere/program/rebootstub export DEPSDIR := $(CURDIR)/$(BUILD) @@ -117,7 +117,7 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) all: check_rebootstub $(BUILD) check_rebootstub: - @$(MAKE) -C $(AMS)/exosphere2/program/rebootstub all + @$(MAKE) -C $(AMS)/exosphere/program/rebootstub all $(BUILD): check_rebootstub @[ -d $@ ] || mkdir -p $@ @@ -126,7 +126,7 @@ $(BUILD): check_rebootstub #--------------------------------------------------------------------------------- clean: @echo clean ... - @$(MAKE) -C $(AMS)/exosphere2/program/rebootstub clean + @$(MAKE) -C $(AMS)/exosphere/program/rebootstub clean @rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf diff --git a/fusee/fusee-secondary/Makefile b/fusee/fusee-secondary/Makefile index b2798e1a1..51a408be4 100644 --- a/fusee/fusee-secondary/Makefile +++ b/fusee/fusee-secondary/Makefile @@ -87,7 +87,7 @@ export TOPDIR := $(CURDIR) export KIPDIRS := $(AMS)/stratosphere/loader $(AMS)/stratosphere/ncm $(AMS)/stratosphere/pm $(AMS)/stratosphere/sm $(AMS)/stratosphere/boot $(AMS)/stratosphere/spl $(AMS)/stratosphere/ams_mitm export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ $(foreach dir,$(DATA),$(CURDIR)/$(dir)) \ - $(AMS)/exosphere2 $(AMS)/exosphere2/warmboot $(AMS)/exosphere2/program/rebootstub \ + $(AMS)/exosphere $(AMS)/exosphere/warmboot $(AMS)/exosphere/program/rebootstub \ $(AMS)/thermosphere $(AMS)/fusee/fusee-primary $(AMS)/sept/sept-primary \ $(AMS)/sept/sept-secondary $(AMS)/emummc $(AMS)/mesosphere/kernel_ldr $(KIPDIRS) @@ -137,7 +137,7 @@ check_fusee_primary: @$(MAKE) -C $(AMS)/fusee/fusee-primary all check_exosphere: - @$(MAKE) -C $(AMS)/exosphere2 all + @$(MAKE) -C $(AMS)/exosphere all check_sept: @$(MAKE) -C $(AMS)/sept all @@ -166,7 +166,7 @@ $(BUILD): check_fusee_primary check_exosphere check_sept check_emummc check_ther clean: @echo clean ... @$(MAKE) -C $(AMS)/fusee/fusee-primary clean - @$(MAKE) -C $(AMS)/exosphere2 clean + @$(MAKE) -C $(AMS)/exosphere clean @$(MAKE) -C $(AMS)/thermosphere clean @$(MAKE) -C $(AMS)/libraries clean @$(MAKE) -C $(AMS)/mesosphere clean diff --git a/sept/sept-secondary/Makefile b/sept/sept-secondary/Makefile index e8567f0dd..93624f79e 100644 --- a/sept/sept-secondary/Makefile +++ b/sept/sept-secondary/Makefile @@ -77,7 +77,7 @@ export TOPDIR := $(CURDIR) export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ $(foreach dir,$(DATA),$(CURDIR)/$(dir)) \ - $(AMS)/exosphere2/program/rebootstub \ + $(AMS)/exosphere/program/rebootstub \ $(TOPDIR)/key_derivation export DEPSDIR := $(CURDIR)/$(BUILD) @@ -118,7 +118,7 @@ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) all: check_rebootstub check_key_derivation $(BUILD) check_rebootstub: - @$(MAKE) -C $(AMS)/exosphere2/program/rebootstub all + @$(MAKE) -C $(AMS)/exosphere/program/rebootstub all check_key_derivation: @$(MAKE) -C key_derivation @@ -138,7 +138,7 @@ endif #--------------------------------------------------------------------------------- clean: @echo clean ... - @$(MAKE) -C $(AMS)/exosphere2/program/rebootstub clean + @$(MAKE) -C $(AMS)/exosphere/program/rebootstub clean @$(MAKE) -C key_derivation clean @rm -fr $(BUILD) $(TARGET).bin $(TARGET)_*.enc $(TARGET).elf