Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50591 )
Change subject: sb/amd/cimx/sb800: Move common OSFL method in ASL ......................................................................
sb/amd/cimx/sb800: Move common OSFL method in ASL
We deal with mb/lippert/frontrunner-af later since it currently does not include <cimx/sb800/acpi/fch.asl>.
Change-Id: I30b611fc1fb01777223d7222adc96308a247a35c Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/50591 Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Arthur Heymans arthur@aheymans.xyz Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/amd/inagua/acpi/mainboard.asl M src/mainboard/amd/persimmon/acpi/mainboard.asl M src/mainboard/amd/south_station/acpi/mainboard.asl M src/mainboard/amd/union_station/acpi/mainboard.asl M src/mainboard/asrock/e350m1/acpi/mainboard.asl M src/mainboard/elmex/pcm205400/acpi/mainboard.asl M src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl M src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl M src/mainboard/pcengines/apu1/acpi/mainboard.asl M src/southbridge/amd/cimx/sb800/acpi/fch.asl 10 files changed, 24 insertions(+), 234 deletions(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/amd/inagua/acpi/mainboard.asl +++ b/src/mainboard/amd/inagua/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/amd/persimmon/acpi/mainboard.asl +++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/amd/south_station/acpi/mainboard.asl +++ b/src/mainboard/amd/south_station/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/amd/union_station/acpi/mainboard.asl +++ b/src/mainboard/amd/union_station/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl +++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl +++ b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl +++ b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl +++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/mainboard/pcengines/apu1/acpi/mainboard.asl b/src/mainboard/pcengines/apu1/acpi/mainboard.asl index 587e9f5..8c38cce 100644 --- a/src/mainboard/pcengines/apu1/acpi/mainboard.asl +++ b/src/mainboard/pcengines/apu1/acpi/mainboard.asl @@ -10,32 +10,6 @@ Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS) /* Base address of PCIe config space */ Name(HPBA, 0xFED00000) /* Base address of HPET table */
-/* Some global data */ -Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ - -Scope(_SB) { - Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if(CondRefOf(_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return(OSVR) - } -} - Scope(_SI) { Method(_SST, 1) { /* DBGO("\_SI\_SST\n") */ diff --git a/src/southbridge/amd/cimx/sb800/acpi/fch.asl b/src/southbridge/amd/cimx/sb800/acpi/fch.asl index 59b556b..ee9b125 100644 --- a/src/southbridge/amd/cimx/sb800/acpi/fch.asl +++ b/src/southbridge/amd/cimx/sb800/acpi/fch.asl @@ -134,6 +134,30 @@ Return (CRES) /* note to change the Name buffer */ } /* end of Method(_SB.PCI0._CRS) */
+/* Some global data */ +Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ + +Method(OSFL, 0){ + + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ + + if(CondRefOf(_OSI)) + { + OSVR = 1 /* Assume some form of XP */ + if (_OSI("Windows 2006")) /* Vista */ + { + OSVR = 2 + } + } else { + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ + } Else { + OSVR = 4 /* Gotta be WinCE */ + } + } + Return(OSVR) +} + /* * * FIRST METHOD CALLED UPON BOOT