Commit 6b8c37eb authored by Ben Avison's avatar Ben Avison

Rationalisation of Hdr:Machine

Detail:
  * Updated comments in 32, All, All32
  * New Machine for IOMD class
  * Phoebe support removed
  * In Hdr:Machine.Machine:
    + Moved the 4 common switches to the top (No32bitCode; No26bitCode;
      NoUnaligned; StrongARM_MSR_bug).
    + Bracketed non 'All' switches, mid term most of these are actually
      kernel private switches, but the HAL kernel still includes a lot of
      pre HAL code so making it tricky to obsolete them in one pass.
    + Bracketed non 'HAL' switches, pending deletion.
    + Bracketed non 'HAL' STB switches, pending deletion.
    + Deleted unused "NewClockChip", "CDVPoduleIRQs", "OldComboSupport",
       "DoPOSTwithoutPowerOn", "M_Phoebe".
    + Moved "HAL32"; "HAL26"; "ROMSizeOffset" to kernel header.
    + Added some comments.
Admin:
  Changes provided by Sprow

Version 2.24. Tagged as 'HdrSrc-2_24'
parent 8d7d9e4b
/* (2.23)
/* (2.24)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.23
#define Module_MajorVersion_CMHG 2.24
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 13 Jan 2013
#define Module_Date_CMHG 27 Jan 2013
#define Module_MajorVersion "2.23"
#define Module_Version 223
#define Module_MajorVersion "2.24"
#define Module_Version 224
#define Module_MinorVersion ""
#define Module_Date "13 Jan 2013"
#define Module_Date "27 Jan 2013"
#define Module_ApplicationDate "13-Jan-13"
#define Module_ApplicationDate "27-Jan-13"
#define Module_ComponentName "HdrSrc"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/HdrSrc"
#define Module_FullVersion "2.23"
#define Module_HelpVersion "2.23 (13 Jan 2013)"
#define Module_LibraryVersionInfo "2:23"
#define Module_FullVersion "2.24"
#define Module_HelpVersion "2.24 (27 Jan 2013)"
#define Module_LibraryVersionInfo "2:24"
......@@ -423,12 +423,16 @@ MchFlgs_CumulativeNOT SETA MchFlgs_CumulativeNOT :OR: :NOT: MchFlgs
ArchitectureOption v2a
ArchitectureOption v2a_FPA
|
[ "$Machine" = "32" ; basic 32-bit capable machines
[ "$Machine" = "32" ; basic 32-bit capable machines (used for many ARM7TDMI and ARM9 ports)
ArchitectureOption v3
ArchitectureOption v3_FPA
ArchitectureOption v4
ArchitectureOption v4T
|
[ "$Machine" = "IOMD" ; 32-bit IOMD-class machines ARM6/ARM7/StrongARM
ArchitectureOption v3
ArchitectureOption v3_FPA
ArchitectureOption v4
ArchitectureOption v4T ; "32" is used for many ARM7TDMI and ARM9 ports
; as well as IOMD-class machines
|
[ "$Machine" = "Tungsten" ; Iyonix PC
ArchitectureOption v5TEX
......@@ -462,6 +466,7 @@ MchFlgs_CumulativeNOT SETA MchFlgs_CumulativeNOT :OR: :NOT: MchFlgs
]
]
]
]
]
GBLL SupportARMv3
......
......@@ -12,7 +12,7 @@
; See the License for the specific language governing permissions and
; limitations under the License.
;
SUBT Pseudo-machine selection for a prototype 32-bit RISC OS
SUBT A non specific 32-bit RISC OS machine ROM target
GBLS Machine
Machine SETS "32"
......
......@@ -12,7 +12,7 @@
; See the License for the specific language governing permissions and
; limitations under the License.
;
SUBT Machine-indeoendent builds
SUBT Machine-independent builds, ARMv2 and later (26 or 32 bit mode)
GBLS Machine
Machine SETS "All"
......
......@@ -12,7 +12,7 @@
; See the License for the specific language governing permissions and
; limitations under the License.
;
SUBT Machine-indeoendent builds
SUBT Machine-independent builds, ARMv3 and later (26 or 32 bit mode)
GBLS Machine
Machine SETS "All32"
......
; Copyright 1997 Acorn Computers Ltd
; Copyright 2013 Castle Technology Ltd
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
......@@ -12,10 +12,10 @@
; See the License for the specific language governing permissions and
; limitations under the License.
;
SUBT Definition of machines that can run RISC OS Ursula
SUBT Acorn IOMD based ARMv3 or ARMv4 (RiscPC/A7k/A7k+/RPCEmu)
GBLS Machine
Machine SETS "Phoebe"
Machine SETS "IOMD"
GET Hdr:Machine.Machine
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment