From b2d2f65b87083c9413f439abed5b3302eb5a2c8b Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 11 Apr 2021 02:07:37 -0700 Subject: [PATCH] boot2: grc is no longer launched by boot2 on 12.0.0+ --- libraries/libstratosphere/source/boot2/boot2_api.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/libstratosphere/source/boot2/boot2_api.cpp b/libraries/libstratosphere/source/boot2/boot2_api.cpp index d660ac5e0..57cc142c6 100644 --- a/libraries/libstratosphere/source/boot2/boot2_api.cpp +++ b/libraries/libstratosphere/source/boot2/boot2_api.cpp @@ -72,7 +72,6 @@ namespace ams::boot2 { ncm::SystemProgramId::Profiler, /* profiler */ ncm::SystemProgramId::Sdb, /* sdb */ ncm::SystemProgramId::Migration, /* migration */ - ncm::SystemProgramId::Grc, /* grc */ ncm::SystemProgramId::Olsc, /* olsc */ ncm::SystemProgramId::Ngct, /* ngct */ }; @@ -113,7 +112,6 @@ namespace ams::boot2 { ncm::SystemProgramId::Profiler, /* profiler */ ncm::SystemProgramId::Sdb, /* sdb */ ncm::SystemProgramId::Migration, /* migration */ - ncm::SystemProgramId::Grc, /* grc */ ncm::SystemProgramId::Olsc, /* olsc */ ncm::SystemProgramId::Ngct, /* ngct */ }; @@ -486,6 +484,11 @@ namespace ams::boot2 { LaunchList(AdditionalLaunchPrograms, NumAdditionalLaunchPrograms); } + /* Prior to 12.0.0, boot2 was responsible for launching grc. */ + if (hos::GetVersion() < hos::Version_12_0_0) { + LaunchProgram(nullptr, ncm::ProgramLocation::Make(ncm::SystemProgramId::Grc, ncm::StorageId::BuiltInSystem), 0); + } + /* Launch user programs off of the SD. */ LaunchFlaggedProgramsOnSdCard(); }