nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fusee/exo2: more fixes to boot lower firmwares

Browse source
This commit is contained in:
Michael Scire 2020-06-12 00:46:21 -07:00 committed by SciresM
parent 47512cc8a2
commit 597bdded69
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
exosphere/Makefile
View file

@ -14,11 +14,13 @@ exosphere.bin: program.lz4 boot_code.lz4
@printf LENY >> exosphere.bin @printf LENY >> exosphere.bin
@echo "Built exosphere.bin..." @echo "Built exosphere.bin..."
program.lz4: program.lz4: build_program
$(MAKE) -C program
@cp program/program.lz4 program.lz4 @cp program/program.lz4 program.lz4
@cp program/boot_code.lz4 boot_code.lz4 @cp program/boot_code.lz4 boot_code.lz4
build_program:
$(MAKE) -C program
warmboot.bin: warmboot.bin:
$(MAKE) -C warmboot $(MAKE) -C warmboot
@cp warmboot/warmboot.bin warmboot.bin @cp warmboot/warmboot.bin warmboot.bin
@ -40,4 +42,4 @@ warmboot-clean:
boot_code-clean: boot_code-clean:
@rm -f boot_code.lz4 @rm -f boot_code.lz4
.PHONY: all clean $(CLEAN_TARGETS) .PHONY: all clean build_program $(CLEAN_TARGETS)

2
exosphere/program/source/smc/secmon_smc_aes.cpp
View file

@ -572,7 +572,7 @@ namespace ams::secmon::smc {
const u8 * const seal_key_source = SealKeySources[seal_key_type]; const u8 * const seal_key_source = SealKeySources[seal_key_type];
/* Decrypt the data. */ /* Decrypt the data. */
if (!DecryptDeviceUniqueData(work_buffer, data_size, nullptr, seal_key_source, se::AesBlockSize, access_key, sizeof(access_key), key_source, sizeof(key_source), work_buffer, data_size, enforce_device_unique)) { if (!DecryptDeviceUniqueData(work_buffer, data_size, nullptr, seal_key_source, se::AesBlockSize, access_key, se::AesBlockSize, key_source, se::AesBlockSize, work_buffer, data_size, enforce_device_unique)) {
return SmcResult::InvalidArgument; return SmcResult::InvalidArgument;
} }

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

@ -954,11 +954,7 @@ uint32_t nxboot_main(void) {
print(SCREEN_LOG_LEVEL_INFO, u8"[NXBOOT] Reading Exosphère...\n"); print(SCREEN_LOG_LEVEL_INFO, u8"[NXBOOT] Reading Exosphère...\n");
/* Select the right address for Exosphère. */ /* Select the right address for Exosphère. */
if (MAILBOX_EXOSPHERE_CONFIGURATION->target_firmware < ATMOSPHERE_TARGET_FIRMWARE_4_0_0) { exosphere_memaddr = (void *)0x40030000;
exosphere_memaddr = (void *)0x4002D000;
} else {
exosphere_memaddr = (void *)0x40030000;
}
/* Copy Exosphère to a good location or read it directly to it. */ /* Copy Exosphère to a good location or read it directly to it. */
if (loader_ctx->exosphere_path[0] != '\0') { if (loader_ctx->exosphere_path[0] != '\0') {

2
fusee/fusee-secondary/src/nxboot.h
View file

@ -35,7 +35,7 @@ typedef struct {
#define MAILBOX_NX_BOOTLOADER_BASE_100_620 0x40002E00 #define MAILBOX_NX_BOOTLOADER_BASE_100_620 0x40002E00
#define MAILBOX_NX_BOOTLOADER_BASE_700 0x40000000 #define MAILBOX_NX_BOOTLOADER_BASE_700 0x40000000
#define MAILBOX_NX_BOOTLOADER_BASE(targetfw) ((targetfw >= ATMOSPHERE_TARGET_FIRMWARE_7_0_0) ? (MAILBOX_NX_BOOTLOADER_BASE_700) : (MAILBOX_NX_BOOTLOADER_BASE_100_620)) #define MAILBOX_NX_BOOTLOADER_BASE(targetfw) (MAILBOX_NX_BOOTLOADER_BASE_700)
#define MAKE_MAILBOX_NX_BOOTLOADER_REG(targetfw, n) MAKE_REG32(MAILBOX_NX_BOOTLOADER_BASE(targetfw) + n) #define MAKE_MAILBOX_NX_BOOTLOADER_REG(targetfw, n) MAKE_REG32(MAILBOX_NX_BOOTLOADER_BASE(targetfw) + n)
#define MAILBOX_NX_BOOTLOADER_BOOT_REASON_BASE(targetfw) (MAILBOX_NX_BOOTLOADER_BASE(targetfw) + 0x10) #define MAILBOX_NX_BOOTLOADER_BOOT_REASON_BASE(targetfw) (MAILBOX_NX_BOOTLOADER_BASE(targetfw) + 0x10)