mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-30 22:45:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

fusee: switch to use exo2 instead of exo1

Browse source
This commit is contained in:
Michael Scire 2020-06-11 01:48:36 -07:00 • committed by SciresM
parent 293c213bf2
commit c75e61a40b
8 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fusee/fusee-primary/Makefile
View file

@ -77,7 +77,7 @@ export TOPDIR := $(CURDIR)
export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
$(AMS)/exosphere/rebootstub
$(AMS)/exosphere2/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)/exosphere/rebootstub all
@$(MAKE) -C $(AMS)/exosphere2/program/rebootstub all
$(BUILD): check_rebootstub
@[ -d $@ ] || mkdir -p $@
@ -126,7 +126,7 @@ $(BUILD): check_rebootstub
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@$(MAKE) -C $(AMS)/exosphere/rebootstub clean
@$(MAKE) -C $(AMS)/exosphere2/program/rebootstub clean
@rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf

8
fusee/fusee-secondary/Makefile
View file

@ -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)/exosphere $(AMS)/exosphere/lp0fw $(AMS)/exosphere/rebootstub \
$(AMS)/exosphere2 $(AMS)/exosphere2/warmboot $(AMS)/exosphere2/program/rebootstub \
$(AMS)/thermosphere $(AMS)/fusee/fusee-primary $(AMS)/sept/sept-primary \
$(AMS)/sept/sept-secondary $(AMS)/emummc $(AMS)/mesosphere/kernel_ldr $(KIPDIRS)
@ -98,7 +98,7 @@ CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
KIPFILES := loader.kip ncm.kip pm.kip sm.kip ams_mitm.kip spl.kip boot.kip
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) fusee-primary.bin \
exosphere.bin lp0fw.bin rebootstub.bin thermosphere.bin splash_screen.bmp \
exosphere.bin warmboot.bin rebootstub.bin thermosphere.bin splash_screen.bmp \
sept-primary.bin sept-secondary_00.enc sept-secondary_01.enc emummc.kip \
sept-secondary_dev_00.enc sept-secondary_dev_01.enc kernel_ldr.bin $(KIPFILES)
@ -137,7 +137,7 @@ check_fusee_primary:
@$(MAKE) -C $(AMS)/fusee/fusee-primary all
check_exosphere:
@$(MAKE) -C $(AMS)/exosphere all
@$(MAKE) -C $(AMS)/exosphere2 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)/exosphere clean
@$(MAKE) -C $(AMS)/exosphere2 clean
@$(MAKE) -C $(AMS)/thermosphere clean
@$(MAKE) -C $(AMS)/libraries clean
@$(MAKE) -C $(AMS)/mesosphere clean

4
fusee/fusee-secondary/linker.ld
View file

@ -228,8 +228,8 @@ SECTIONS
PROVIDE(__fusee_primary_bin_size__ = fusee_primary_bin_end - fusee_primary_bin);
PROVIDE(__loader_kip_start__ = loader_kip - __start__);
PROVIDE(__loader_kip_size__ = loader_kip_end - loader_kip);
PROVIDE(__lp0fw_bin_start__ = lp0fw_bin - __start__);
PROVIDE(__lp0fw_bin_size__ = lp0fw_bin_end - lp0fw_bin);
PROVIDE(__warmboot_bin_start__ = warmboot_bin - __start__);
PROVIDE(__warmboot_bin_size__ = warmboot_bin_end - warmboot_bin);
PROVIDE(__ncm_kip_start__ = ncm_kip - __start__);
PROVIDE(__ncm_kip_size__ = ncm_kip_end - ncm_kip);
PROVIDE(__pm_kip_start__ = pm_kip - __start__);

10
fusee/fusee-secondary/src/nxboot.c
View file

@ -58,13 +58,13 @@
#include "sept_secondary_01_enc.h"
#include "sept_secondary_dev_00_enc.h"
#include "sept_secondary_dev_01_enc.h"
#include "lp0fw_bin.h"
#include "warmboot_bin.h"
#include "emummc_kip.h"
#undef u8
#undef u32
extern const uint8_t lp0fw_bin[];
extern const uint32_t lp0fw_bin_size;
extern const uint8_t warmboot_bin[];
extern const uint32_t warmboot_bin_size;
static const uint8_t retail_pkc_modulus[0x100] = {
0xF7, 0x86, 0x47, 0xAB, 0x71, 0x89, 0x81, 0xB5, 0xCF, 0x0C, 0xB0, 0xE8, 0x48, 0xA7, 0xFD, 0xAD,
@ -891,14 +891,14 @@ uint32_t nxboot_main(void) {
}
} else {
/* Use Atmosphere's warmboot firmware implementation. */
warmboot_fw_size = lp0fw_bin_size;
warmboot_fw_size = warmboot_bin_size;
warmboot_fw = malloc(warmboot_fw_size);
if (warmboot_fw == NULL) {
fatal_error("[NXBOOT] Out of memory!\n");
}
memcpy(warmboot_fw, lp0fw_bin, warmboot_fw_size);
memcpy(warmboot_fw, warmboot_bin, warmboot_fw_size);
if (warmboot_fw_size == 0) {
fatal_error("[NXBOOT] Could not read the warmboot firmware from Package1!\n");

8
fusee/fusee-secondary/src/start.s
View file

@ -157,15 +157,15 @@ _content_headers:
.asciz "Loader"
.align 5
/* lp0fw content header */
.word __lp0fw_bin_start__
.word __lp0fw_bin_size__
/* warmboot content header */
.word __warmboot_bin_start__
.word __warmboot_bin_size__
.byte CONTENT_TYPE_WBT
.byte CONTENT_FLAG_NONE
.byte CONTENT_FLAG_NONE
.byte CONTENT_FLAG_NONE
.word 0xCCCCCCCC
.asciz "lp0fw"
.asciz "warmboot"
.align 5
/* pm content header */