Change some default CMOS settings, using custom build switch

Detail:
  Default to SCSI::4 for boot driver is custom switch at buildtime
  (EnforceSCSI4) is defined. 2 fontcache items also defaulted with this switch
Admin:
  tested on iMx6


Version 5.35, 4.79.2.290. Tagged as 'Kernel-5_35-4_79_2_290'

VersionASM

@@ -13,11 +13,11 @@
                         GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "5.35"
 Module_Version          SETA    535
-Module_MinorVersion     SETS    "4.79.2.289"
-Module_Date             SETS    "20 Sep 2015"
-Module_ApplicationDate  SETS    "20-Sep-15"
+Module_MinorVersion     SETS    "4.79.2.290"
+Module_Date             SETS    "24 Sep 2015"
+Module_ApplicationDate  SETS    "24-Sep-15"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.35 (4.79.2.289)"
-Module_HelpVersion      SETS    "5.35 (20 Sep 2015) 4.79.2.289"
+Module_FullVersion      SETS    "5.35 (4.79.2.290)"
+Module_HelpVersion      SETS    "5.35 (24 Sep 2015) 4.79.2.290"
                         END

VersionNum

@@ -5,19 +5,19 @@
  *
  */
 #define Module_MajorVersion_CMHG        5.35
-#define Module_MinorVersion_CMHG        4.79.2.289
-#define Module_Date_CMHG                20 Sep 2015
+#define Module_MinorVersion_CMHG        4.79.2.290
+#define Module_Date_CMHG                24 Sep 2015
 
 #define Module_MajorVersion             "5.35"
 #define Module_Version                  535
-#define Module_MinorVersion             "4.79.2.289"
-#define Module_Date                     "20 Sep 2015"
+#define Module_MinorVersion             "4.79.2.290"
+#define Module_Date                     "24 Sep 2015"
 
-#define Module_ApplicationDate          "20-Sep-15"
+#define Module_ApplicationDate          "24-Sep-15"
 
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Kernel"
 
-#define Module_FullVersion              "5.35 (4.79.2.289)"
-#define Module_HelpVersion              "5.35 (20 Sep 2015) 4.79.2.289"
+#define Module_FullVersion              "5.35 (4.79.2.290)"
+#define Module_HelpVersion              "5.35 (24 Sep 2015) 4.79.2.290"
 #define Module_LibraryVersionInfo       "5:35"

hdr/Options

@@ -424,6 +424,13 @@ SVC2632 * SVC32_mode
  |
 USR2632 * USR26_mode
 SVC2632 * SVC26_mode
+ ]
+
+; Switch to alter default CMOS settings for SCSI::4 as default drive
+
+ [ :LNOT: :DEF: EnforceSCSI4
+       GBLL   EnforceSCSI4
+EnforceSCSI4   SETL    {FALSE}
  ]
 
         END

s/PMF/i2cutils

@@ -1813,7 +1813,11 @@ DefaultCMOSTable
         DCB     FileLangCMOS,       fsnumber_adfs   ; ADFS
       ]
     ]
+    [ EnforceSCSI4
+        DCB     FontCMOS,           255     ; Changed to 1016k from 256K for modern machines
+    |
         DCB     FontCMOS,           64      ; KJB 13-Dec-02: Changed to 256K from 64K
+    ]
         DCB     PigCMOS,            10
         DCB     KeyRepCMOS,         8
         DCB     RMASizeCMOS,        0
@@ -1891,8 +1895,12 @@ DefaultCMOSTable
         ;       FontMaxCMOS                     yes, omitting is deliberate!
         DCB     FontMax2CMOS,       &2C       ; 32 point
         DCB     FontMax3CMOS,       &38       ; 32 point
+      |
+      [ EnforceSCSI4
+        DCB     FontMaxCMOS,        255       ; 16380k
       |
         DCB     FontMaxCMOS,        64        ; 4096k
+      ]
         DCB     FontMax2CMOS,       36:EOR:12 ; 36 point
         DCB     FontMax3CMOS,       36:EOR:24 ; 36 point
         DCB     FontMax4CMOS,       16        ; 16 point
@@ -1907,6 +1915,9 @@ DefaultCMOSTable
       |
         DCB     CDROMFSCMOS,        &C1                  ; drives = 1, buffer size = 256K
       ]
+      [ EnforceSCSI4
+        DCB     SCSIFSDrivesCMOS,   &20                  ; default to SCSIFS Drive 4
+      ]
  ]
         DCB     &FF
         ALIGN