From 622a6c896dd83555e02aa90d61771f29967c1970 Mon Sep 17 00:00:00 2001 From: Jan4V Date: Sun, 19 Jan 2020 21:58:18 +0100 Subject: [PATCH] fusee: fix dev sept usage --- fusee/fusee-secondary/Makefile | 10 ++++++++++ fusee/fusee-secondary/src/nxboot.c | 20 ++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/fusee/fusee-secondary/Makefile b/fusee/fusee-secondary/Makefile index 11c9c945f..c932cc117 100644 --- a/fusee/fusee-secondary/Makefile +++ b/fusee/fusee-secondary/Makefile @@ -221,6 +221,16 @@ sept_secondary_01.enc.o sept_secondary_01_enc.h: sept-secondary_01.enc #--------------------------------------------------------------------------------- @echo $(notdir $<) @$(_bin2o) + +sept_secondary_dev00.enc.o sept_secondary_dev00_enc.h: sept-secondary_dev00.enc +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(_bin2o) + +sept_secondary_dev01.enc.o sept_secondary_dev01_enc.h: sept-secondary_dev01.enc +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(_bin2o) %.bin.o %_bin.h: %.bin #--------------------------------------------------------------------------------- diff --git a/fusee/fusee-secondary/src/nxboot.c b/fusee/fusee-secondary/src/nxboot.c index 16da0576b..5a2faa244 100644 --- a/fusee/fusee-secondary/src/nxboot.c +++ b/fusee/fusee-secondary/src/nxboot.c @@ -56,6 +56,8 @@ #include "exosphere_bin.h" #include "sept_secondary_00_enc.h" #include "sept_secondary_01_enc.h" +#include "sept_secondary_dev00_enc.h" +#include "sept_secondary_dev01_enc.h" #include "lp0fw_bin.h" #include "emummc_kip.h" #undef u8 @@ -630,12 +632,22 @@ uint32_t nxboot_main(void) { fatal_error("[NXBOOT] Failed to read the TSEC firmware from Package1loader!\n"); } if (target_firmware >= ATMOSPHERE_TARGET_FIRMWARE_810) { - sept_secondary_enc = sept_secondary_01_enc; - sept_secondary_enc_size = sept_secondary_01_enc_size; + if (!fuse_get_retail_type()) { + sept_secondary_enc = sept_secondary_dev01_enc; + sept_secondary_enc_size = sept_secondary_dev01_enc_size; + } else { + sept_secondary_enc = sept_secondary_01_enc; + sept_secondary_enc_size = sept_secondary_01_enc_size; + } tsec_fw_size = 0x3300; } else if (target_firmware >= ATMOSPHERE_TARGET_FIRMWARE_700) { - sept_secondary_enc = sept_secondary_00_enc; - sept_secondary_enc_size = sept_secondary_00_enc_size; + if (!fuse_get_retail_type()) { + sept_secondary_enc = sept_secondary_dev00_enc; + sept_secondary_enc_size = sept_secondary_dev00_enc_size; + } else { + sept_secondary_enc = sept_secondary_00_enc; + sept_secondary_enc_size = sept_secondary_00_enc_size; + } tsec_fw_size = 0x3000; } else if (target_firmware == ATMOSPHERE_TARGET_FIRMWARE_620) { tsec_fw_size = 0x2900;