Previous version did not work.

Detail:
    Forgot to add a section of code when merging the work - the new reson
code would not work.
Admin:
    Built and tested this time ;-)

Version 5.42. Tagged as 'Kernel-5_42'

VersionASM

@@ -11,14 +11,14 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "5.41"
-Module_Version          SETA    541
+Module_MajorVersion     SETS    "5.42"
+Module_Version          SETA    542
 Module_MinorVersion     SETS    ""
 Module_Date             SETS    "10 Apr 2001"
 Module_ApplicationDate2 SETS    "10-Apr-01"
 Module_ApplicationDate4 SETS    "10-Apr-2001"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.41"
-Module_HelpVersion      SETS    "5.41 (10 Apr 2001)"
+Module_FullVersion      SETS    "5.42"
+Module_HelpVersion      SETS    "5.42 (10 Apr 2001)"
                         END

VersionNum

-/* (5.41)
+/* (5.42)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        5.41
+#define Module_MajorVersion_CMHG        5.42
 #define Module_MinorVersion_CMHG        
 #define Module_Date_CMHG                10 Apr 2001
 
-#define Module_MajorVersion             "5.41"
-#define Module_Version                  541
+#define Module_MajorVersion             "5.42"
+#define Module_Version                  542
 #define Module_MinorVersion             ""
 #define Module_Date                     "10 Apr 2001"
 
@@ -18,5 +18,5 @@
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "RiscOS/Sources/Kernel"
 
-#define Module_FullVersion              "5.41"
-#define Module_HelpVersion              "5.41 (10 Apr 2001)"
+#define Module_FullVersion              "5.42"
+#define Module_HelpVersion              "5.42 (10 Apr 2001)"

s/PMF/i2cutils

@@ -1893,7 +1893,11 @@ NVMemorySWI     ENTRY
         ExitSWIHandler
 
 NVMemorySub
+  [ E2ROMSupport
+        CMP     R0, #5
+  |
         CMP     R0, #4
+  ]
         ADDLS   PC, PC, R0, LSL #2
         B       NVMemory_Unknown
         B       NVMemory_Size