From 07f91f0a83200c736d82ed33473352a8fedee732 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 22 Mar 2022 11:09:46 -0700 Subject: [PATCH] boot2: launch omm before am --- .../include/stratosphere/ncm/ncm_system_content_meta_id.hpp | 2 ++ .../source/boot2/boot2_api.board.nintendo_nx.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp index d6974c7b0..9d68e9a3e 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp @@ -96,6 +96,7 @@ namespace ams::ncm { static const SystemProgramId Nd; static const SystemProgramId Ngct; static const SystemProgramId Pgl; + static const SystemProgramId Omm; static const SystemProgramId End; @@ -201,6 +202,7 @@ namespace ams::ncm { inline constexpr const SystemProgramId SystemProgramId::Nd = { 0x0100000000000040ul }; inline constexpr const SystemProgramId SystemProgramId::Ngct = { 0x0100000000000041ul }; inline constexpr const SystemProgramId SystemProgramId::Pgl = { 0x0100000000000042ul }; + inline constexpr const SystemProgramId SystemProgramId::Omm = { 0x0100000000000045ul }; inline constexpr const SystemProgramId SystemProgramId::End = { 0x01000000000007FFul }; diff --git a/libraries/libstratosphere/source/boot2/boot2_api.board.nintendo_nx.cpp b/libraries/libstratosphere/source/boot2/boot2_api.board.nintendo_nx.cpp index 99faee716..7141f7427 100644 --- a/libraries/libstratosphere/source/boot2/boot2_api.board.nintendo_nx.cpp +++ b/libraries/libstratosphere/source/boot2/boot2_api.board.nintendo_nx.cpp @@ -34,6 +34,7 @@ namespace ams::boot2 { constexpr size_t NumPreSdCardLaunchPrograms = util::size(PreSdCardLaunchPrograms); constexpr const ncm::SystemProgramId AdditionalLaunchPrograms[] = { + ncm::SystemProgramId::Omm, /* omm */ ncm::SystemProgramId::Am, /* am */ ncm::SystemProgramId::NvServices, /* nvservices */ ncm::SystemProgramId::NvnFlinger, /* nvnflinger */ @@ -77,6 +78,7 @@ namespace ams::boot2 { constexpr size_t NumAdditionalLaunchPrograms = util::size(AdditionalLaunchPrograms); constexpr const ncm::SystemProgramId AdditionalMaintenanceLaunchPrograms[] = { + ncm::SystemProgramId::Omm, /* omm */ ncm::SystemProgramId::Am, /* am */ ncm::SystemProgramId::NvServices, /* nvservices */ ncm::SystemProgramId::NvnFlinger, /* nvnflinger */