From b87046cff745d091c3330b7dea3ba0b5cad2f882 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Fri, 18 May 2012 10:22:09 +0000
Subject: [PATCH] Removed one more place where the cache parameters were
hard-coded
Detail:
This one evaded the cull in my last commit
Admin:
Still works on a Raspberry Pi
Version 5.35, 4.79.2.147.2.3. Tagged as 'Kernel-5_35-4_79_2_147_2_3'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
s/HAL | 6 ------
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/VersionASM b/VersionASM
index 0a58d71..3658dac 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.2"
-Module_Date SETS "14 May 2012"
-Module_ApplicationDate SETS "14-May-12"
+Module_MinorVersion SETS "4.79.2.147.2.3"
+Module_Date SETS "18 May 2012"
+Module_ApplicationDate SETS "18-May-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.147.2.2)"
-Module_HelpVersion SETS "5.35 (14 May 2012) 4.79.2.147.2.2"
+Module_FullVersion SETS "5.35 (4.79.2.147.2.3)"
+Module_HelpVersion SETS "5.35 (18 May 2012) 4.79.2.147.2.3"
END
diff --git a/VersionNum b/VersionNum
index 564e8a7..46c95e9 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.147.2.2
-#define Module_Date_CMHG 14 May 2012
+#define Module_MinorVersion_CMHG 4.79.2.147.2.3
+#define Module_Date_CMHG 18 May 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.147.2.2"
-#define Module_Date "14 May 2012"
+#define Module_MinorVersion "4.79.2.147.2.3"
+#define Module_Date "18 May 2012"
-#define Module_ApplicationDate "14-May-12"
+#define Module_ApplicationDate "18-May-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.147.2.2)"
-#define Module_HelpVersion "5.35 (14 May 2012) 4.79.2.147.2.2"
+#define Module_FullVersion "5.35 (4.79.2.147.2.3)"
+#define Module_HelpVersion "5.35 (18 May 2012) 4.79.2.147.2.3"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/HAL b/s/HAL
index 44b88e2..df0eff7 100644
--- a/s/HAL
+++ b/s/HAL
@@ -838,12 +838,6 @@ MMUon_nol1ptoverlap
MOV v3, #0 ; "MMU is on" signal
BL ARM_Analyse
- ! 0, "FIXME: temporary code"
-;!!! STILL DON'T KNOW WHY THE BODGE IN ARM_ANALYSE ITSELF DOESN'T WORK!
- MOV a1,#0
- MOV a2,#32
- STRB a2,[a1,#DCache_LineLen]
- STRB a2,[a1,#ICache_LineLen]
ChangedProcVecs a1
--
GitLab