Merge upstream Atmosphere master into boot-storage

libraries/libexosphere/include/exosphere/pkg1/pkg1_boot_config.hpp

@@ -61,14 +61,15 @@ namespace ams::pkg1 {
     }
 
     struct BootConfigData {
-        u32 version;
-        u32 reserved_04;
+        u64 version;
         u32 reserved_08;
         u32 reserved_0C;
         u8 flags1[0x10];
         u8 flags0[0x10];
         u64 initial_tsc_value;
-        u8 padding_38[0x200 - 0x38];
+        u8 padding_38[0x38];
+        u64 unknown_70;
+        u8 padding_78[0x200 - 0x78];
 
         constexpr bool IsDevelopmentFunctionEnabled() const {
             return (this->flags1[0] & (1 << 1)) != 0;
@@ -97,13 +98,16 @@ namespace ams::pkg1 {
         constexpr u64 GetInitialTscValue() const {
             return this->IsInitialTscValueValid() ? this->initial_tsc_value : 0;
         }
+        
+        constexpr u64 GetUnknown70() const {
+            return this->unknown_70;
+        }
     };
     static_assert(util::is_pod<BootConfigData>::value);
     static_assert(sizeof(BootConfigData) == 0x200);
 
     struct BootConfigSignedData {
-        u32 version;
-        u32 reserved_04;
+        u64 version;
         u8  flags;
         u8  reserved_09[0x10 - 9];
         u8  ecid[0x10];

libraries/libexosphere/include/exosphere/pkg1/pkg1_key_generation.hpp

@@ -42,6 +42,7 @@ namespace ams::pkg1 {
         KeyGeneration_20_0_0 = 0x13,
         KeyGeneration_21_0_0 = 0x14,
         KeyGeneration_22_0_0 = 0x15,
+        KeyGeneration_23_0_0 = 0x16,
 
         KeyGeneration_Count,
 

libraries/libexosphere/include/exosphere/pkg2.hpp

@@ -24,7 +24,7 @@ namespace ams::pkg2 {
     constexpr inline int PayloadCount = 3;
 
     constexpr inline int MinimumValidDataVersion  = 0;   /* We allow older package2 to load; this value is currently 0x18 in Nintendo's code. */
-    constexpr inline int CurrentBootloaderVersion = 0x17;
+    constexpr inline int CurrentBootloaderVersion = 0x18;
 
     struct Package2Meta {
         using Magic = util::FourCC<'P','K','2','1'>;