boot2: grc is no longer launched by boot2 on 12.0.0+

This commit is contained in:
Michael Scire 2021-04-11 02:07:37 -07:00 committed by SciresM
parent b2b0c50802
commit b2d2f65b87

View file

@ -72,7 +72,6 @@ namespace ams::boot2 {
ncm::SystemProgramId::Profiler, /* profiler */ ncm::SystemProgramId::Profiler, /* profiler */
ncm::SystemProgramId::Sdb, /* sdb */ ncm::SystemProgramId::Sdb, /* sdb */
ncm::SystemProgramId::Migration, /* migration */ ncm::SystemProgramId::Migration, /* migration */
ncm::SystemProgramId::Grc, /* grc */
ncm::SystemProgramId::Olsc, /* olsc */ ncm::SystemProgramId::Olsc, /* olsc */
ncm::SystemProgramId::Ngct, /* ngct */ ncm::SystemProgramId::Ngct, /* ngct */
}; };
@ -113,7 +112,6 @@ namespace ams::boot2 {
ncm::SystemProgramId::Profiler, /* profiler */ ncm::SystemProgramId::Profiler, /* profiler */
ncm::SystemProgramId::Sdb, /* sdb */ ncm::SystemProgramId::Sdb, /* sdb */
ncm::SystemProgramId::Migration, /* migration */ ncm::SystemProgramId::Migration, /* migration */
ncm::SystemProgramId::Grc, /* grc */
ncm::SystemProgramId::Olsc, /* olsc */ ncm::SystemProgramId::Olsc, /* olsc */
ncm::SystemProgramId::Ngct, /* ngct */ ncm::SystemProgramId::Ngct, /* ngct */
}; };
@ -486,6 +484,11 @@ namespace ams::boot2 {
LaunchList(AdditionalLaunchPrograms, NumAdditionalLaunchPrograms); 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. */ /* Launch user programs off of the SD. */
LaunchFlaggedProgramsOnSdCard(); LaunchFlaggedProgramsOnSdCard();
} }