diff options
| author | Felix Singer <felixsinger@posteo.net> | 2022-12-16 07:11:17 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-12-23 10:18:48 +0000 |
| commit | 35e65a8bc36628baad7d2ed94bef7619971e6d88 (patch) | |
| tree | a3b4d2afe3494eee4049db95f04a69d61113f006 /src/mainboard | |
| parent | 86bc2e708dc2600c5611b6573d43645e7d57e561 (diff) | |
tree: Replace And(a,b,c) with ASL 2.0 syntax
Replace `And (a, b, c)` with `c = a & b`, respectively `c &= b` where
possible.
Change-Id: Ie558f9d0b597c56ca3b31498edb68de8877d3a2f
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70850
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
6 files changed, 12 insertions, 12 deletions
diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl index 4ea50c5aac..98b52f279b 100644 --- a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl +++ b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl @@ -36,7 +36,7 @@ Device (MBRS) CreateQWordField (MSBF, \_SB.MBRS._Y1C._MAX, MEMM) CreateQWordField (MSBF, \_SB.MBRS._Y1C._LEN, LELM) - And (\_SB.PCI0.RLAR, 0x03FF, Local1) + Local1 = \_SB.PCI0.RLAR & 0x03FF Local1++ If (Local1 > 0x40) { @@ -47,7 +47,7 @@ Device (MBRS) CreateDWordField (MSBF, \_SB.MBRS._Y1D._MIN, MS00) CreateDWordField (MSBF, \_SB.MBRS._Y1D._MAX, MS01) CreateDWordField (MSBF, \_SB.MBRS._Y1D._LEN, MEM2) - And (\_SB.PCI0.TOLM, 0xF800, Local1) + Local1 = \_SB.PCI0.TOLM & 0xF800 Local1 >>= 4 Local1-- If (Local1 > 0x10) diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl index 6976be84d4..2a206e08fe 100644 --- a/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl +++ b/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl @@ -41,7 +41,7 @@ Method (_CRS, 0, NotSerialized) CreateDWordField (PBRS, \_SB.PCI0._Y08._MIN, MEML) CreateDWordField (PBRS, \_SB.PCI0._Y08._MAX, MEMH) CreateDWordField (PBRS, \_SB.PCI0._Y08._LEN, LENM) - And (\_SB.PCI0.TOLM, 0xF800, Local1) + Local1 = \_SB.PCI0.TOLM & 0xF800 Local1 >>= 4 MEML = Local1 << 0x14 MEMH = IO_APIC_ADDR - 1 diff --git a/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl b/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl index 8fb24bf88a..2d223c515a 100644 --- a/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl +++ b/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl @@ -115,7 +115,7 @@ Device (ICH0) Local0 = PBAR If (Local0 && 1) { - And (Local0, 0xFFFE, Local0) + Local0 &= 0xFFFE IOA1 = Local0 IOA2 = Local0 IOAL = 0x80 @@ -129,7 +129,7 @@ Device (ICH0) Local0 = GBAR If (Local0 && 1) { - And (Local0, 0xFFFE, Local0) + Local0 &= 0xFFFE IOS1 = Local0 IOS2 = Local0 IOSL = 0x40 diff --git a/src/mainboard/aopen/dxplplusu/acpi/superio.asl b/src/mainboard/aopen/dxplplusu/acpi/superio.asl index cd8dc8bf2f..bb1632971d 100644 --- a/src/mainboard/aopen/dxplplusu/acpi/superio.asl +++ b/src/mainboard/aopen/dxplplusu/acpi/superio.asl @@ -110,28 +110,28 @@ Method (_INI, 0, NotSerialized) /* GPIO initial output levels */ Local0 = GP_1 - And( Local0, 0x7C, Local0) + Local0 &= 0x7C Local0 |= 0x81 GP_1 = Local0 Local0 = GP_2 - And( Local0, 0xFE, Local0) + Local0 &= 0xFE Local0 |= 0 GP_2 = Local0 Local0 = GP_3 - And( Local0, 0x7F, Local0) + Local0 &= 0x7F Local0 |= 0x80 GP_3 = Local0 Local0 = GP_4 - And( Local0, 0x7F, Local0) + Local0 &= 0x7F Local0 |= 0 GP_4 = Local0 /* Power Led */ Local0 = LED1 - And( Local0, 0xfc, Local0) + Local0 &= 0xfc Local0 |= 1 LED1 = Local0 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 1f46c69aeb..7ab1b84706 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,7 @@ Scope (\_SB) { Method (GPID, 0, Serialized) // GPID: Get Project ID for Terra2/Terra3 { - And(\BDID >> 3, 0x01, Local0) + Local0 = (\BDID >> 3) & 1 Return (Local0) } } diff --git a/src/mainboard/lenovo/s230u/acpi/gpe.asl b/src/mainboard/lenovo/s230u/acpi/gpe.asl index f9ba2096fb..27daf64028 100644 --- a/src/mainboard/lenovo/s230u/acpi/gpe.asl +++ b/src/mainboard/lenovo/s230u/acpi/gpe.asl @@ -20,7 +20,7 @@ Scope (_GPE) Local0 = One << Arg1 If (Arg0 == Zero) { Not (Local0, Local0) - And (GIV0, Local0, GIV0) + GIV0 &= Local0 } Else { GIV0 |= Local0 } |