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>
This commit is contained in:
Kyösti Mälkki
parent
29b030dfcf
commit
05af850b28
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -10,32 +10,6 @@ Name(PBLN, 0x0) /* Length of BIOS area */
|
|||
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") */
|
||||
|
|
|
|||
|
|
@ -134,6 +134,30 @@ Method(_CRS, 0) {
|
|||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue