fusee-secondary: Remove restriction for loading from eMMC

This commit is contained in:
hexkyz 2018-08-01 21:15:16 +01:00 committed by GitHub
parent 4b8455baf9
commit 6eac78595e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -87,16 +87,12 @@ void nxboot_main(void) {
fatal_error("Failed to open Package2 from %s: %s!\n", loader_ctx->package2_path, strerror(errno)); fatal_error("Failed to open Package2 from %s: %s!\n", loader_ctx->package2_path, strerror(errno));
} }
} else { } else {
#ifdef I_KNOW_WHAT_IM_DOING_2
pk2file = fopen("bcpkg21:/", "rb"); pk2file = fopen("bcpkg21:/", "rb");
if (pk2file == NULL || fseek(pk2file, 0x4000, SEEK_SET) != 0) { if (pk2file == NULL || fseek(pk2file, 0x4000, SEEK_SET) != 0) {
printf("Error: Failed to open Package2 from eMMC: %s!\n", strerror(errno)); printf("Error: Failed to open Package2 from eMMC: %s!\n", strerror(errno));
fclose(pk2file); fclose(pk2file);
generic_panic(); generic_panic();
} }
#else
fatal_error("Package2 must be loaded from the SD card, unless you know what you are doing!\n");
#endif
} }
setvbuf(pk2file, NULL, _IONBF, 0); /* Workaround. */ setvbuf(pk2file, NULL, _IONBF, 0); /* Workaround. */
@ -193,7 +189,7 @@ void nxboot_main(void) {
package2_rebuild_and_copy(package2, MAILBOX_EXOSPHERE_CONFIGURATION->target_firmware); package2_rebuild_and_copy(package2, MAILBOX_EXOSPHERE_CONFIGURATION->target_firmware);
printf(u8"Reading Exosphère...\n"); printf(u8"Reading Exosphère...\n");
/* Copy Exophè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 (MAILBOX_EXOSPHERE_CONFIGURATION->target_firmware <= EXOSPHERE_TARGET_FIRMWARE_400) { if (MAILBOX_EXOSPHERE_CONFIGURATION->target_firmware <= EXOSPHERE_TARGET_FIRMWARE_400) {
exosphere_memaddr = (void *)0x40020000; exosphere_memaddr = (void *)0x40020000;
} else { } else {