Commit 3e7e3a11 authored by Paul Skirrow's avatar Paul Skirrow
Browse files

Removed redundant MACFROMNVRAM introduced in Kernel 5.09.

Detail:
  MACFROMNVRAM was intended to force the Kernel to fetch the MAC
  address from NVRAM for Customer F 5. In practice it is not needed
  as its main purpose was to avoid getting the MAC address from
  the RawMachineID but this will not happen in Customer F 5 as
  RawMachineID will not be set.

Admin:
  Not tested.
  MACFROMNVRAM will be removed from HdrSrc.

Version 5.17. Tagged as 'Kernel-5_17'
parent 889a2de1
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "5.16"
Module_Version SETA 516
Module_MajorVersion SETS "5.17"
Module_Version SETA 517
Module_MinorVersion SETS ""
Module_Date SETS "17 Feb 2000"
Module_FullVersion SETS "5.16"
Module_Date SETS "22 Feb 2000"
Module_FullVersion SETS "5.17"
END
/* (5.16)
/* (5.17)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.16
#define Module_MajorVersion_CMHG 5.17
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Feb 2000
#define Module_Date_CMHG 22 Feb 2000
#define Module_MajorVersion "5.16"
#define Module_Version 516
#define Module_MajorVersion "5.17"
#define Module_Version 517
#define Module_MinorVersion ""
#define Module_Date "17 Feb 2000"
#define Module_Date "22 Feb 2000"
#define Module_FullVersion "5.16"
#define Module_FullVersion "5.17"
......@@ -1289,7 +1289,6 @@ IOST_BATMAN * 64 ;Stork keyboard/battery controller seems to be present
; by this call in preference to a locally provided value.
40
[ :LNOT: MACFROMNVRAM
MOV r0, #0
LDRB r1, [ r0, #RawMachineID ] ; The family byte
TEQ r1, #&81 ; Is this a custom part?
......@@ -1319,10 +1318,9 @@ IOST_BATMAN * 64 ;Stork keyboard/battery controller seems to be present
]
MOV r1, #0 ; Top 16 bits are zero
ExitSWIHandler
]
ExitNoEthernetAddress
[ :LNOT: STB :LAND: :LNOT: MACFROMNVRAM
[ :LNOT: STB
MOV r0, #0
MOV r1, #0
ExitSWIHandler
......@@ -1337,7 +1335,7 @@ ExitNoEthernetAddress
ExitSWIHandler
]
[ STB :LOR: MACFROMNVRAM
[ STB
GetMachineAddressCMOS
; Out: r0 = lower 4 bytes (or 0)
; r1 = upper 2 bytes (or 0)
......
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