From 7c2d9d924272f6fb413d330a33dd37fd1cd17288 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Sun, 8 Jul 2012 23:07:56 +0000
Subject: [PATCH] Change default filesystem to SDFS in Raspberry Pi/ARM11
builds
Detail:
s/NewReset - Change default filesystem to SDFS for ARM11 builds, as that's somewhat more appropriate than ADFS when on the Pi. Also now using filesystem numbers from Hdr:FSNumbers instead of magic numbers.
Admin:
Builds, but untested
Version 5.35, 4.79.2.147.2.14. Tagged as 'Kernel-5_35-4_79_2_147_2_14'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
s/NewReset | 8 ++++++--
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/VersionASM b/VersionASM
index 58e0bad..d4c1679 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 0388e62..dd4cd4f 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 b354139..fa13fc2 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
--
GitLab