diff --git a/VersionASM b/VersionASM index 58e0bad05a7c55061e61c3f56bf09121b71f5ad4..d4c167914ef330c6b7d077d6cd2e12b31dc78532 100644 --- a/VersionASM +++ b/VersionASM @@ -13,11 +13,11 @@ GBLS Module_ComponentPath Module_MajorVersion SETS "5.35" Module_Version SETA 535 -Module_MinorVersion SETS "4.79.2.147.2.13" -Module_Date SETS "07 Jul 2012" -Module_ApplicationDate SETS "07-Jul-12" +Module_MinorVersion SETS "4.79.2.147.2.14" +Module_Date SETS "09 Jul 2012" +Module_ApplicationDate SETS "09-Jul-12" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.147.2.13)" -Module_HelpVersion SETS "5.35 (07 Jul 2012) 4.79.2.147.2.13" +Module_FullVersion SETS "5.35 (4.79.2.147.2.14)" +Module_HelpVersion SETS "5.35 (09 Jul 2012) 4.79.2.147.2.14" END diff --git a/VersionNum b/VersionNum index 0388e624c3ddcbd10ba6d69ecc285e410be3d1e9..dd4cd4fee01298354fc4be84b3427569af08adea 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.147.2.13 -#define Module_Date_CMHG 07 Jul 2012 +#define Module_MinorVersion_CMHG 4.79.2.147.2.14 +#define Module_Date_CMHG 09 Jul 2012 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.147.2.13" -#define Module_Date "07 Jul 2012" +#define Module_MinorVersion "4.79.2.147.2.14" +#define Module_Date "09 Jul 2012" -#define Module_ApplicationDate "07-Jul-12" +#define Module_ApplicationDate "09-Jul-12" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.147.2.13)" -#define Module_HelpVersion "5.35 (07 Jul 2012) 4.79.2.147.2.13" +#define Module_FullVersion "5.35 (4.79.2.147.2.14)" +#define Module_HelpVersion "5.35 (09 Jul 2012) 4.79.2.147.2.14" #define Module_LibraryVersionInfo "5:35" diff --git a/s/NewReset b/s/NewReset index b3541393875c4d10ea580caeda6b0e087a09d119..fa13fc218181f9e3859aeb8a3b60c86dcc21fd3e 100644 --- a/s/NewReset +++ b/s/NewReset @@ -1068,9 +1068,13 @@ DefaultCMOSTable ; list of non-zero options wanted : ; terminated by offset &FF = KeyDelCMOS, 32 [ M_CortexA8 :LOR: M_CortexA9 - = FileLangCMOS, 26 ; SCSIFS for OMAP3, etc. + = FileLangCMOS, fsnumber_SCSIFS ; SCSIFS for OMAP3, etc. | - = FileLangCMOS, 8 ; ADFS + [ M_ARM11ZF + = FileLangCMOS, fsnumber_SDFS ; SDFS for Pi, etc. + | + = FileLangCMOS, fsnumber_ADFS ; ADFS + ] ] = FontCMOS, 64 ; KJB 13-Dec-02: Changed to 256K from 64K = PigCMOS, 10