HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46045 )
Change subject: mb/*/*/acpi: Convert 'mainboard.asl' to ASL 2.0 syntax ......................................................................
mb/*/*/acpi: Convert 'mainboard.asl' to ASL 2.0 syntax
Change-Id: I06beaa30a1a34543559c95895d7ae3754b9c9a59 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- 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/google/auron/acpi/mainboard.asl M src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl M src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl M src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl M src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl M src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl M src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl M src/mainboard/google/beltino/acpi/mainboard.asl M src/mainboard/google/butterfly/acpi/mainboard.asl M src/mainboard/google/cyan/variants/terra/include/variant/acpi/mainboard.asl M src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl M src/mainboard/google/jecht/acpi/mainboard.asl M src/mainboard/google/parrot/acpi/mainboard.asl M src/mainboard/google/rambi/acpi/mainboard.asl M src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl M src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl M src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl M src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl M src/mainboard/google/stout/acpi/mainboard.asl M src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl M src/mainboard/intel/strago/acpi/mainboard.asl M src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl M src/mainboard/lenovo/g505s/acpi/mainboard.asl M src/mainboard/pcengines/apu1/acpi/mainboard.asl M src/mainboard/samsung/lumpy/acpi/mainboard.asl 32 files changed, 138 insertions(+), 138 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/46045/1
diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/amd/inagua/acpi/mainboard.asl +++ b/src/mainboard/amd/inagua/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/amd/persimmon/acpi/mainboard.asl +++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/amd/south_station/acpi/mainboard.asl +++ b/src/mainboard/amd/south_station/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/amd/union_station/acpi/mainboard.asl +++ b/src/mainboard/amd/union_station/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl +++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl +++ b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl +++ b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/google/auron/acpi/mainboard.asl b/src/mainboard/google/auron/acpi/mainboard.asl index 746efa2..1be0a47 100644 --- a/src/mainboard/google/auron/acpi/mainboard.asl +++ b/src/mainboard/google/auron/acpi/mainboard.asl @@ -19,8 +19,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_WLAN_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_WLAN_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } diff --git a/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl index febaffe..cc26de6 100644 --- a/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } diff --git a/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl index febaffe..cc26de6 100644 --- a/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } diff --git a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl index b3dc42c..4b0ac45 100644 --- a/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/auron/variants/buddy/include/variant/acpi/mainboard.asl @@ -24,7 +24,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -59,7 +59,7 @@
Method (_STA) { - If (LEqual (\S2EN, 1)) { + If (\S2EN == 1) { Return (0xF) } Else { Return (0x0) @@ -70,8 +70,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TOUCHSCREEN_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } @@ -96,7 +96,7 @@ { Store (BUDDY_NIC_WAKE_GPIO, Local0)
- If (LEqual (Arg0, 1)) { + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } diff --git a/src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl index febaffe..cc26de6 100644 --- a/src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/auron/variants/gandof/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } diff --git a/src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl index 76e1f2e..35f0d3c 100644 --- a/src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/auron/variants/lulu/include/variant/acpi/mainboard.asl @@ -31,17 +31,17 @@
Method(_DSM, 0x4, NotSerialized) { - If (LEqual(Arg0, ToUUID("3CDFF6F7-4267-4555-AD05-B30A3D8938DE"))) /* I2C-HID UUID */ + If (Arg0 == ToUUID("3CDFF6F7-4267-4555-AD05-B30A3D8938DE")) /* I2C-HID UUID */ { - If (LEqual(Arg2, Zero)) /* DSM Function */ + If (Arg2 == 0) /* DSM Function */ { /* Function 0: Query function, return based on revision */ - If (LEqual(Arg1, One)) /* Arg1 DSM Revision */ + If (Arg1 == 1) /* Arg1 DSM Revision */ { /* Revision 1: Function 0 supported */ Return(Buffer(One) { 0x03 }) } - } ElseIf (LEqual(Arg2, One)) /* Function 1 : HID Function */ + } ElseIf (Arg2 == 1) /* Function 1 : HID Function */ { Return(0x0020) /* HID Descriptor Address */ } @@ -52,7 +52,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -63,8 +63,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } @@ -100,7 +100,7 @@
Method (_STA) { - If (LEqual (\S2EN, 1)) { + If (\S2EN == 1) { Return (0xF) } Else { Return (0x0) @@ -111,8 +111,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TOUCHSCREEN_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } diff --git a/src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl b/src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl index 4329d5f..9ca592f 100644 --- a/src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/auron/variants/samus/include/variant/acpi/mainboard.asl @@ -30,8 +30,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } @@ -39,7 +39,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -141,8 +141,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_CODEC_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_CODEC_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } @@ -150,7 +150,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -188,8 +188,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_CODEC_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_CODEC_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } @@ -198,7 +198,7 @@
Method (_STA) { - If (LEqual (\S2EN, 1)) { + If (\S2EN == 1) { Return (0xF) } Else { Return (0x0) diff --git a/src/mainboard/google/beltino/acpi/mainboard.asl b/src/mainboard/google/beltino/acpi/mainboard.asl index 3049dbe..10696ff 100644 --- a/src/mainboard/google/beltino/acpi/mainboard.asl +++ b/src/mainboard/google/beltino/acpi/mainboard.asl @@ -14,9 +14,9 @@
Method (_DSW, 3, NotSerialized) { - Store (NIC_WAKE_GPIO, Local0) + Local0 = NIC_WAKE_GPIO
- If (LEqual (Arg0, 1)) { + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } @@ -36,9 +36,9 @@
Method (_DSW, 3, NotSerialized) { - Store (WLAN_WAKE_GPIO, Local0) + Local0 = WLAN_WAKE_GPIO
- If (LEqual (Arg0, 1)) { + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } diff --git a/src/mainboard/google/butterfly/acpi/mainboard.asl b/src/mainboard/google/butterfly/acpi/mainboard.asl index 02ef905..3552e29 100644 --- a/src/mainboard/google/butterfly/acpi/mainboard.asl +++ b/src/mainboard/google/butterfly/acpi/mainboard.asl @@ -8,7 +8,7 @@ Name (_HID, EisaId("PNP0C0D")) Method (_LID, 0) { - Store (_SB.PCI0.LPCB.EC0.LIDF, \LIDS) + \LIDS = _SB.PCI0.LPCB.EC0.LIDF Return (\LIDS) } } diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/mainboard.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/mainboard.asl index 0bee309..a2a7640 100644 --- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/mainboard.asl @@ -10,7 +10,8 @@ { Method (GPID, 0, Serialized) // GPID: Get Project ID for Terra2/Terra3 { - And( ShiftRight (\BDID, 3, Local0), 0x01, Local0) + Local0 = \BDID >> 3 + Local0 &= 0x01 Return (Local0) } } diff --git a/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl b/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl index f382e08..2cc694b 100644 --- a/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl @@ -87,18 +87,17 @@ */ Method (_DSM, 4, NotSerialized) { - If (LEqual (Arg0, ToUUID - ("3cdff6f7-4267-4555-ad05-b30a3d8938de"))) { - If (LEqual (Arg2, Zero)) { + If (Arg0 == ToUUID("3cdff6f7-4267-4555-ad05-b30a3d8938de")) { + If (Arg2 == 0) { /* Function 0 - Query */ - If (LEqual (Arg1, One)) { + If (Arg1 == 1) { /* Revision 1 Function 1 */ Return (Buffer (One) { 0x03 }) } Else { /* Revision 2+ not supported */ Return (Buffer (One) { 0x00 }) } - } ElseIf (LEqual (Arg2, One)) { + } ElseIf (Arg2 == 1) { /* Function 1 - HID Descriptor Addr */ Return (0x0001) } Else { diff --git a/src/mainboard/google/jecht/acpi/mainboard.asl b/src/mainboard/google/jecht/acpi/mainboard.asl index da92d2c..8a90ae6 100644 --- a/src/mainboard/google/jecht/acpi/mainboard.asl +++ b/src/mainboard/google/jecht/acpi/mainboard.asl @@ -14,9 +14,9 @@
Method (_DSW, 3, NotSerialized) { - Store (JECHT_NIC_WAKE_GPIO, Local0) + Local0 = JECHT_NIC_WAKE_GPIO
- If (LEqual (Arg0, 1)) { + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } @@ -36,9 +36,9 @@
Method (_DSW, 3, NotSerialized) { - Store (JECHT_WLAN_WAKE_GPIO, Local0) + Local0 = JECHT_WLAN_WAKE_GPIO
- If (LEqual (Arg0, 1)) { + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GPIO.GWAK (Local0) } diff --git a/src/mainboard/google/parrot/acpi/mainboard.asl b/src/mainboard/google/parrot/acpi/mainboard.asl index 39a428b..6d5e907 100644 --- a/src/mainboard/google/parrot/acpi/mainboard.asl +++ b/src/mainboard/google/parrot/acpi/mainboard.asl @@ -22,7 +22,7 @@ Name(_HID, EisaId("PNP0C0D")) Method(_LID, 0) { - Store (GP15, \LIDS) + \LIDS = GP15 Return (\LIDS) } } diff --git a/src/mainboard/google/rambi/acpi/mainboard.asl b/src/mainboard/google/rambi/acpi/mainboard.asl index 1d0c71e..bfbb66b 100644 --- a/src/mainboard/google/rambi/acpi/mainboard.asl +++ b/src/mainboard/google/rambi/acpi/mainboard.asl @@ -23,7 +23,7 @@ Method (_CRS) { /* Only return interrupt if I2C1 is PCI mode */ - If (LEqual (\S1EN, 0)) { + If (\S1EN == 0) { Return (^RBUF) }
@@ -51,7 +51,7 @@ Method (_CRS) { /* Return interrupt if I2C6 is PCI mode */ - If (LEqual (\S6EN, 0)) { + If (\S6EN == 0) { Return (^RBUF) }
@@ -93,7 +93,7 @@
Method (_STA) { - If (LEqual (\S2EN, 1)) { + If (\S2EN == 1) { Return (0xF) } Else { Return (0x0) diff --git a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl index d395a31..49f146c 100644 --- a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } diff --git a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl index bf4adfd..e5af385 100644 --- a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl index 8bbb19a..5a7d294 100644 --- a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } @@ -68,7 +68,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -79,8 +79,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } @@ -119,8 +119,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TOUCHSCREEN_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } @@ -135,7 +135,7 @@
Method (_STA) { - If (LEqual (\S2EN, 1)) { + If (\S2EN == 1) { Return (0xF) } Else { Return (0x0) diff --git a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl index bf4adfd..e5af385 100644 --- a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl @@ -26,7 +26,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -37,8 +37,8 @@
Method (_DSW, 3, NotSerialized) { - Store (BOARD_TRACKPAD_WAKE_GPIO, Local0) - If (LEqual (Arg0, 1)) { + Local0 = BOARD_TRACKPAD_WAKE_GPIO + If (Arg0 == 1) { // Enable GPIO as wake source _SB.PCI0.LPCB.GWAK (Local0) } diff --git a/src/mainboard/google/stout/acpi/mainboard.asl b/src/mainboard/google/stout/acpi/mainboard.asl index 6cbe92e..f8cbe21 100644 --- a/src/mainboard/google/stout/acpi/mainboard.asl +++ b/src/mainboard/google/stout/acpi/mainboard.asl @@ -9,14 +9,14 @@
Method (_LID, 0) { - Store (_SB.PCI0.LPCB.EC0.HPLD, \LIDS) + \LIDS = _SB.PCI0.LPCB.EC0.HPLD Return (\LIDS) }
Method (_PSW, 1) { // Enable/Disable LID as a wake source - Store (Arg0, _SB.PCI0.LPCB.EC0.HWLO) + _SB.PCI0.LPCB.EC0.HWLO = Arg0 } } } diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl index dd3318e..be68630 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl +++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl @@ -56,7 +56,7 @@ */ Method (PNOT) { - Store("Received PNOT call (probably from EC)", Debug) + Debug = "Received PNOT call (probably from EC)" /* TODO: Implement this */ }
@@ -75,7 +75,7 @@ /* Make sure lid trigger polarity is set so that we * trigger an SCI when lid status changes. */ - Not(GE22, LPOL) + LPOL = ~GE22 } }
@@ -95,7 +95,7 @@ /* Toggle wireless */ Method (WLTG) { - Store( Not(GP57), GP57 ) + GP57 = ~GP57 } /* Return lid state */ Method (LIDS) diff --git a/src/mainboard/intel/strago/acpi/mainboard.asl b/src/mainboard/intel/strago/acpi/mainboard.asl index 0a7fb5c..dcfb040 100644 --- a/src/mainboard/intel/strago/acpi/mainboard.asl +++ b/src/mainboard/intel/strago/acpi/mainboard.asl @@ -41,7 +41,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -80,7 +80,7 @@
Method (_STA) { - If (LEqual (\S1EN, 1)) { + If (\S1EN == 1) { Return (0xF) } Else { Return (0x0) @@ -155,7 +155,7 @@
Method (_STA) { - If (LEqual (\S6EN, 1)) { + If (\S6EN == 1) { Return (0xF) } Else { Return (0x0) diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl +++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/lenovo/g505s/acpi/mainboard.asl b/src/mainboard/lenovo/g505s/acpi/mainboard.asl index dd3318e..be68630 100644 --- a/src/mainboard/lenovo/g505s/acpi/mainboard.asl +++ b/src/mainboard/lenovo/g505s/acpi/mainboard.asl @@ -56,7 +56,7 @@ */ Method (PNOT) { - Store("Received PNOT call (probably from EC)", Debug) + Debug = "Received PNOT call (probably from EC)" /* TODO: Implement this */ }
@@ -75,7 +75,7 @@ /* Make sure lid trigger polarity is set so that we * trigger an SCI when lid status changes. */ - Not(GE22, LPOL) + LPOL = ~GE22 } }
@@ -95,7 +95,7 @@ /* Toggle wireless */ Method (WLTG) { - Store( Not(GP57), GP57 ) + GP57 = ~GP57 } /* Return lid state */ Method (LIDS) diff --git a/src/mainboard/pcengines/apu1/acpi/mainboard.asl b/src/mainboard/pcengines/apu1/acpi/mainboard.asl index 9283191..5c0929a 100644 --- a/src/mainboard/pcengines/apu1/acpi/mainboard.asl +++ b/src/mainboard/pcengines/apu1/acpi/mainboard.asl @@ -18,20 +18,20 @@ Scope(_SB) { Method(OSFL, 0){
- if(LNotEqual(OSVR, Ones)) {Return(OSVR)} /* OS version was already detected */ + if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */
if(CondRefOf(_OSI)) { - Store(1, OSVR) /* Assume some form of XP */ + OSVR = 1 /* Assume some form of XP */ if (_OSI("Windows 2006")) /* Vista */ { - Store(2, OSVR) + OSVR = 2 } } else { - If(WCMP(_OS,"Linux")) { - Store(3, OSVR) /* Linux */ + If (WCMP(_OS,"Linux")) { + OSVR = 3 /* Linux */ } Else { - Store(4, OSVR) /* Gotta be WinCE */ + OSVR = 4 /* Gotta be WinCE */ } } Return(OSVR) diff --git a/src/mainboard/samsung/lumpy/acpi/mainboard.asl b/src/mainboard/samsung/lumpy/acpi/mainboard.asl index 9b5ae77..d9c9d61 100644 --- a/src/mainboard/samsung/lumpy/acpi/mainboard.asl +++ b/src/mainboard/samsung/lumpy/acpi/mainboard.asl @@ -8,7 +8,7 @@ Name(_HID, EisaId("PNP0C0D")) Method(_LID, 0) { - Store (_SB.PCI0.LPCB.EC0.LIDS, \LIDS) + \LIDS = _SB.PCI0.LPCB.EC0.LIDS Return (\LIDS) }
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46045 )
Change subject: mb/*/*/acpi: Convert 'mainboard.asl' to ASL 2.0 syntax ......................................................................
Patch Set 1:
This patch is rather large. Could you please split the google boards into separate commits, please?
HAOUAS Elyes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/46045 )
Change subject: mb/*/*/acpi: Convert 'mainboard.asl' to ASL 2.0 syntax ......................................................................
Abandoned
squashed
-
Angel Pons (Code Review) -
HAOUAS Elyes (Code Review)