From 276a05dd0266e67dafa1aaac407ca1505d643e57 Mon Sep 17 00:00:00 2001
From: Steve Revill <srevill@gitlab.riscosopen.org>
Date: Mon, 8 Oct 2012 13:33:31 +0000
Subject: [PATCH] Some tweaks ahead of an RPi code freeze.
Default CMOS tweaks now apply for the RPi hardware. Was missed in
the previous commit.
You can now build the Kernel without the ROM debug output stuff
that's enabled for odd-numbered builds, by passing FREEZE_DEV_REL=TRUE
into the makefile. For example, in the Components file, you'd add:
-options FREEZE_DEV_REL=TRUE
onto the Kernel line.
Version 5.35, 4.79.2.171. Tagged as 'Kernel-5_35-4_79_2_171'
---
Makefile | 7 ++++++-
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
hdr/Options | 19 ++++++++++++-------
s/NewReset | 2 +-
5 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/Makefile b/Makefile
index 6bd669c..129eff7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,11 @@
EXP_HDR = <export$dir>
C_EXP_HDR = <cexport$dir>.Global.h
+# Override this to "TRUE" in the components file if
+# you want an odd-numbered (development) build to be
+# a 'freezable' build - e.g. with no ROM debug output
+FREEZE_DEV_REL ?= FALSE
+
#
# Generic options:
#
@@ -41,7 +46,7 @@ XWIPE = x wipe
PERL = do <Perl$Dir>.perl
CCFLAGS = -c -depend !Depend -IC:
ASFLAGS = -depend !Depend ${THROWBACK} -Stamp -quit -To $@ -From
-ARMASMFLAGS = -depend !Depend -g ${THROWBACK}
+ARMASMFLAGS = -depend !Depend -PD "FreezeDevRel SETL {${FREEZE_DEV_REL}}" -g ${THROWBACK}
CPFLAGS = ~cfr~v
WFLAGS = ~cfr~v
diff --git a/VersionASM b/VersionASM
index ebfe2ed..535c6a0 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.170"
-Module_Date SETS "07 Oct 2012"
-Module_ApplicationDate SETS "07-Oct-12"
+Module_MinorVersion SETS "4.79.2.171"
+Module_Date SETS "08 Oct 2012"
+Module_ApplicationDate SETS "08-Oct-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.170)"
-Module_HelpVersion SETS "5.35 (07 Oct 2012) 4.79.2.170"
+Module_FullVersion SETS "5.35 (4.79.2.171)"
+Module_HelpVersion SETS "5.35 (08 Oct 2012) 4.79.2.171"
END
diff --git a/VersionNum b/VersionNum
index 40f889a..9e84e48 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.170
-#define Module_Date_CMHG 07 Oct 2012
+#define Module_MinorVersion_CMHG 4.79.2.171
+#define Module_Date_CMHG 08 Oct 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.170"
-#define Module_Date "07 Oct 2012"
+#define Module_MinorVersion "4.79.2.171"
+#define Module_Date "08 Oct 2012"
-#define Module_ApplicationDate "07-Oct-12"
+#define Module_ApplicationDate "08-Oct-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.170)"
-#define Module_HelpVersion "5.35 (07 Oct 2012) 4.79.2.170"
+#define Module_FullVersion "5.35 (4.79.2.171)"
+#define Module_HelpVersion "5.35 (08 Oct 2012) 4.79.2.171"
#define Module_LibraryVersionInfo "5:35"
diff --git a/hdr/Options b/hdr/Options
index 4a3dc99..12a3b4b 100644
--- a/hdr/Options
+++ b/hdr/Options
@@ -275,20 +275,25 @@ RMTidyDoesNowt SETL {TRUE} ; should really be "machine has
RogerEXEY SETL {FALSE} ; Marketing don't like it!
GBLL DebugROMInit
+ GBLL DebugROMErrors
+ GBLL DebugHALTX
+
+ [ FreezeDevRel
+DebugROMInit SETL {FALSE}
+DebugROMErrors SETL {FALSE}
+DebugHALTX SETL {FALSE}
+ |
DebugROMInit SETL (Version :AND: 1) = 1 ; Yes for odd numbered development
+DebugROMErrors SETL (Version :AND: 1) = 1 ; Yes for odd numbered development
+DebugHALTX SETL (Version :AND: 1) = 1 ; Yes for odd numbered development
+ ]
GBLL DebugROMPostInit ; Displays when the PostInit service call is sent to each ROM module (currently works on vanilla service call handling only)
-DebugROMPostInit SETL (:LNOT: ChocolateService) :LAND: {FALSE}
-
- GBLL DebugROMErrors
-DebugROMErrors SETL (Version :AND: 1) = 1 ; Yes for odd numbered development
+DebugROMPostInit SETL (:LNOT: ChocolateService) :LAND: {FALSE}
GBLL DebugTerminal ; default WRCH and RDCH through HAL
DebugTerminal SETL {FALSE}
- GBLL DebugHALTX
-DebugHALTX SETL (Version :AND: 1) = 1 ; Yes for odd numbered development
-
GBLL InverseTextTransparency
InverseTextTransparency SETL {FALSE}
diff --git a/s/NewReset b/s/NewReset
index b8c0d13..cd6ff06 100644
--- a/s/NewReset
+++ b/s/NewReset
@@ -1152,7 +1152,7 @@ DefaultCMOSTable ; list of non-zero options wanted :
]
= AlarmAndTimeCMOS,2_00010000 ; !Alarm autosave on
= FSLockCMOS+5, &EA ; Checksum for no password
- [ M_CortexA8 :LOR: M_CortexA9
+ [ M_CortexA8 :LOR: M_CortexA9 :LOR: M_ARM11ZF
= CDROMFSCMOS, &C0 ; drives = 0, buffer size = 256K
= NetworkFlags, LanManFStransport ; LMTransport is NetBIOS over IP
= WimpDragMoveLimitCMOS, (1:SHL:2) ; WimpIconiseButton
--
GitLab