diff --git a/bootloader/hos/fss.c b/bootloader/hos/fss.c index 84fa965..abd25de 100644 --- a/bootloader/hos/fss.c +++ b/bootloader/hos/fss.c @@ -125,7 +125,11 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path, fss0_sept_t *sept_ctxt) stock = true; } +#ifdef HOS_MARIKO_STOCK_SECMON if (stock && emummc_disabled && (pkg1_old || h_cfg.t210b01)) +#else + if (stock && emummc_disabled && pkg1_old) +#endif return 1; } diff --git a/bootloader/hos/hos.h b/bootloader/hos/hos.h index a8b57ac..b5900c6 100644 --- a/bootloader/hos/hos.h +++ b/bootloader/hos/hos.h @@ -42,6 +42,9 @@ #define HOS_PKG11_MAGIC 0x31314B50 #define HOS_EKS_MAGIC 0x30534B45 +// Use official Mariko secmon when in stock. +//#define HOS_MARIKO_STOCK_SECMON + typedef struct _exo_ctxt_t { bool fs_is_510; diff --git a/bootloader/hos/pkg1.c b/bootloader/hos/pkg1.c index e77d6f2..b4cd792 100644 --- a/bootloader/hos/pkg1.c +++ b/bootloader/hos/pkg1.c @@ -264,6 +264,7 @@ void pkg1_secmon_patch(void *hos_ctxt, u32 secmon_base, bool t210b01) // For T210 till 6.2.0 the patching is used as is, because of no compression. secmon_patchset = ctxt->pkg1_id->secmon_patchset; } +#ifdef HOS_MARIKO_STOCK_SECMON else if (t210b01) { // For T210B01 we patch 6.X.X as is. Otherwise we decompress the program payload. @@ -294,6 +295,7 @@ void pkg1_secmon_patch(void *hos_ctxt, u32 secmon_base, bool t210b01) *(vu32 *)patch_offset = _NOP(); } } +#endif else return;