diff --git a/exosphere/program/source/smc/secmon_smc_info.cpp b/exosphere/program/source/smc/secmon_smc_info.cpp index fb533156c..365d31f27 100644 --- a/exosphere/program/source/smc/secmon_smc_info.cpp +++ b/exosphere/program/source/smc/secmon_smc_info.cpp @@ -52,7 +52,7 @@ namespace ams::secmon::smc { [fuse::DramId_IcosaSamsung6GB] = pkg1::MemorySize_6GB, [fuse::DramId_HoagHynix1y4GB] = pkg1::MemorySize_4GB, [fuse::DramId_AulaHynix1y4GB] = pkg1::MemorySize_4GB, - [fuse::DramId_IowaX1X2Samsung4GB] = pkg1::MemorySize_4GB, + [fuse::DramId_Deprecated7] = pkg1::MemorySize_4GB, [fuse::DramId_IowaSansung4GB] = pkg1::MemorySize_4GB, [fuse::DramId_IowaSamsung8GB] = pkg1::MemorySize_8GB, [fuse::DramId_IowaHynix4GB] = pkg1::MemorySize_4GB, @@ -61,7 +61,7 @@ namespace ams::secmon::smc { [fuse::DramId_HoagSamsung8GB] = pkg1::MemorySize_8GB, [fuse::DramId_HoagHynix4GB] = pkg1::MemorySize_4GB, [fuse::DramId_HoagMicron4GB] = pkg1::MemorySize_4GB, - [fuse::DramId_IowaSamsung4GBY] = pkg1::MemorySize_4GB, + [fuse::DramId_Deprecated16] = pkg1::MemorySize_4GB, [fuse::DramId_IowaSamsung1y4GBX] = pkg1::MemorySize_4GB, [fuse::DramId_IowaSamsung1y8GBX] = pkg1::MemorySize_8GB, [fuse::DramId_HoagSamsung1y4GBX] = pkg1::MemorySize_4GB, @@ -74,6 +74,12 @@ namespace ams::secmon::smc { [fuse::DramId_HoagMicron1y4GB] = pkg1::MemorySize_4GB, [fuse::DramId_AulaMicron1y4GB] = pkg1::MemorySize_4GB, [fuse::DramId_AulaSamsung1y8GBX] = pkg1::MemorySize_8GB, + [fuse::DramId_IowaX1X2Samsung4GB] = pkg1::MemorySize_4GB, + [fuse::DramId_HoagX1X2Samsung4GB] = pkg1::MemorySize_4GB, + [fuse::DramId_AulaX1X2Samsung4GB] = pkg1::MemorySize_4GB, + [fuse::DramId_IowaSamsung4GBY] = pkg1::MemorySize_4GB, + [fuse::DramId_HoagSamsung4GBY] = pkg1::MemorySize_4GB, + [fuse::DramId_AulaSamsung4GBY] = pkg1::MemorySize_4GB, }; constexpr const pkg1::MemoryMode MemoryModes[] = { diff --git a/fusee/program/source/fusee_package2.cpp b/fusee/program/source/fusee_package2.cpp index c61732896..055bad33d 100644 --- a/fusee/program/source/fusee_package2.cpp +++ b/fusee/program/source/fusee_package2.cpp @@ -80,7 +80,7 @@ namespace ams::nxboot { } /* Check that the key generation is one that we can use. */ - static_assert(pkg1::KeyGeneration_Count == 14); + static_assert(pkg1::KeyGeneration_Count == 15); if (key_generation >= pkg1::KeyGeneration_Count) { return false; } diff --git a/libraries/libexosphere/include/exosphere/fuse.hpp b/libraries/libexosphere/include/exosphere/fuse.hpp index 63bf917d9..34d15fa1b 100644 --- a/libraries/libexosphere/include/exosphere/fuse.hpp +++ b/libraries/libexosphere/include/exosphere/fuse.hpp @@ -55,7 +55,7 @@ namespace ams::fuse { DramId_IcosaSamsung6GB = 4, DramId_HoagHynix1y4GB = 5, DramId_AulaHynix1y4GB = 6, - DramId_IowaX1X2Samsung4GB = 7, + DramId_Deprecated7 = 7, DramId_IowaSansung4GB = 8, DramId_IowaSamsung8GB = 9, DramId_IowaHynix4GB = 10, @@ -64,7 +64,7 @@ namespace ams::fuse { DramId_HoagSamsung8GB = 13, DramId_HoagHynix4GB = 14, DramId_HoagMicron4GB = 15, - DramId_IowaSamsung4GBY = 16, + DramId_Deprecated16 = 16, DramId_IowaSamsung1y4GBX = 17, DramId_IowaSamsung1y8GBX = 18, DramId_HoagSamsung1y4GBX = 19, @@ -82,7 +82,7 @@ namespace ams::fuse { DramId_AulaX1X2Samsung4GB = 31, DramId_IowaSamsung4GBY = 32, DramId_HoagSamsung4GBY = 33, - DramId_AulaSamsung4GBY = 34, + DramId_AulaSamsung4GBY = 34, DramId_Count, };