mainboard/acpi: Replace constant "One" with actual number

Change-Id: Id1078b14a805eea53d2a7c5a8183a5413f26e115
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71521
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

49 files changed, 146 insertions, 146 deletions

diff --git a/src/mainboard/google/auron/acpi/thermal.asl b/src/mainboard/google/auron/acpi/thermal.asl
index 898ef26ef2..9b4cffebfa 100644
--- a/src/mainboard/google/auron/acpi/thermal.asl
+++ b/src/mainboard/google/auron/acpi/thermal.asl
@@ -131,7 +131,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -158,7 +158,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/usb.asl
index 768a690e94..15a13286db 100644
--- a/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/auron_paine/include/variant/acpi/usb.asl
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
@@ -82,7 +82,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
diff --git a/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/usb.asl
index da4d5583f2..9a8a4dcf59 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/auron_yuna/include/variant/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
@@ -65,7 +65,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
diff --git a/src/mainboard/google/auron/variants/gandof/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/gandof/include/variant/acpi/usb.asl
index da4d5583f2..9a8a4dcf59 100644
--- a/src/mainboard/google/auron/variants/gandof/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/gandof/include/variant/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
@@ -65,7 +65,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
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 35f0d3c206..fcf1c8c005 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
@@ -39,7 +39,7 @@ Scope (\_SB.PCI0.I2C0)
 					If (Arg1 == 1) /* Arg1 DSM Revision */
 					{
 						/* Revision 1: Function 0 supported */
-						Return(Buffer(One) { 0x03 })
+						Return(Buffer(1) { 0x03 })
 					}
 				} ElseIf (Arg2 == 1) /* Function 1 : HID Function */
 				{
@@ -47,7 +47,7 @@ Scope (\_SB.PCI0.I2C0)
 				}
 			}
 
-			Return(Buffer(One) { 0x00 }) /* Not supported */
+			Return(Buffer(1) { 0x00 }) /* Not supported */
 		}
 
 		Method (_STA)
diff --git a/src/mainboard/google/auron/variants/lulu/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/lulu/include/variant/acpi/usb.asl
index 68ef14f2fe..519f60fd03 100644
--- a/src/mainboard/google/auron/variants/lulu/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/lulu/include/variant/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT1)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
diff --git a/src/mainboard/google/auron/variants/samus/include/variant/acpi/usb.asl b/src/mainboard/google/auron/variants/samus/include/variant/acpi/usb.asl
index bf47043097..666e11a858 100644
--- a/src/mainboard/google/auron/variants/samus/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/auron/variants/samus/include/variant/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT1)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
@@ -48,7 +48,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -82,7 +82,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
diff --git a/src/mainboard/google/beltino/acpi/thermal.asl b/src/mainboard/google/beltino/acpi/thermal.asl
index c6b686ee6c..ef93848b26 100644
--- a/src/mainboard/google/beltino/acpi/thermal.asl
+++ b/src/mainboard/google/beltino/acpi/thermal.asl
@@ -158,7 +158,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -183,7 +183,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -208,7 +208,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -233,7 +233,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -258,7 +258,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/google/beltino/acpi/usb.asl b/src/mainboard/google/beltino/acpi/usb.asl
index 681fae9d5a..7cee5acbb3 100644
--- a/src/mainboard/google/beltino/acpi/usb.asl
+++ b/src/mainboard/google/beltino/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	// Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -65,7 +65,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	// Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT6)
@@ -82,7 +82,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT6)
 	// Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.SSP1)
diff --git a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
index 4759dbb019..95f2d4391c 100644
--- a/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
+++ b/src/mainboard/google/cyan/acpi/touchscreen_synaptics.asl
@@ -19,30 +19,30 @@ Scope (\_SB.PCI0.I2C1)
 				// DSM Revision
 				If (Arg2 == Zero)
 				{
-					If (Arg1 == One)
+					If (Arg1 == 1)
 					{
-						Return (Buffer (One)
+						Return (Buffer (1)
 						{
 							0x03
 						})
 					}
 					Else
 					{
-						Return (Buffer (One)
+						Return (Buffer (1)
 						{
 							0x00
 						})
 					}
 				}
 				// HID Function
-				If (Arg2 == One)
+				If (Arg2 == 1)
 				{
 					Return (0x20)
 				}
 			}
 			Else
 			{
-				Return (Buffer (One)
+				Return (Buffer (1)
 				{
 					0x00
 				})
diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl
index 19f26097cd..3a4b44e721 100644
--- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl
+++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl
@@ -156,7 +156,7 @@ Device (DPTF)
 
 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
index 7f1131b6bf..94c80da10d 100644
--- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
@@ -52,7 +52,7 @@ Device (TSR0)
 
 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -120,7 +120,7 @@ Device (TSR1)
 
 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
@@ -188,7 +188,7 @@ Device (TSR2)
 
 	Method (_STA)
 	{
-		If (\DPTE == One) {
+		If (\DPTE == 1) {
 			Return (0xF)
 		} Else {
 			Return (0x0)
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 c942e72e20..927476ffea 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
@@ -90,22 +90,22 @@ Scope (\_SB.PCI0.I2C2)
 			If (Arg0 == ToUUID ("3cdff6f7-4267-4555-ad05-b30a3d8938de")) {
 				If (Arg2 == Zero) {
 					/* Function 0 - Query */
-					If (Arg1 == One) {
+					If (Arg1 == 1) {
 						/* Revision 1 Function 1 */
-						Return (Buffer (One) { 0x03 })
+						Return (Buffer (1) { 0x03 })
 					} Else {
 						/* Revision 2+ not supported */
-						Return (Buffer (One) { 0x00 })
+						Return (Buffer (1) { 0x00 })
 					}
-				} ElseIf (Arg2 == One) {
+				} ElseIf (Arg2 == 1) {
 					/* Function 1 - HID Descriptor Addr */
 					Return (0x0001)
 				} Else {
 					/* Function 2+ not supported */
-					Return (Buffer (One) { 0x00 })
+					Return (Buffer (1) { 0x00 })
 				}
 			} Else {
-				Return (Buffer (One) { 0x00 })
+				Return (Buffer (1) { 0x00 })
 			}
 		}
 	}
diff --git a/src/mainboard/google/glados/variants/chell/include/variant/acpi/mainboard.asl b/src/mainboard/google/glados/variants/chell/include/variant/acpi/mainboard.asl
index 15d979d583..b37a411853 100644
--- a/src/mainboard/google/glados/variants/chell/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/glados/variants/chell/include/variant/acpi/mainboard.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS01)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.HS02)
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS02)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.HS03)
@@ -82,7 +82,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.HS05)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.HS07)
diff --git a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl
index 81562e9097..2f6fd90ec9 100644
--- a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl
@@ -159,7 +159,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -184,7 +184,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -209,7 +209,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -234,7 +234,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -259,7 +259,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl
index 81562e9097..2f6fd90ec9 100644
--- a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl
@@ -159,7 +159,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -184,7 +184,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -209,7 +209,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -234,7 +234,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -259,7 +259,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl
index 81562e9097..2f6fd90ec9 100644
--- a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl
@@ -159,7 +159,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -184,7 +184,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -209,7 +209,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -234,7 +234,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -259,7 +259,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/usb.asl b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/usb.asl
index a6b55b44d0..7c3283c46c 100644
--- a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT4)
@@ -65,7 +65,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT6)
@@ -82,7 +82,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT6)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
diff --git a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl
index 1411429322..4f1746b0cf 100644
--- a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl
@@ -267,7 +267,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -292,7 +292,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -317,7 +317,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -342,7 +342,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -367,7 +367,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/google/link/acpi/thermal.asl b/src/mainboard/google/link/acpi/thermal.asl
index 7ea38ae6cd..e2af307af0 100644
--- a/src/mainboard/google/link/acpi/thermal.asl
+++ b/src/mainboard/google/link/acpi/thermal.asl
@@ -156,7 +156,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -177,7 +177,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/google/parrot/acpi/usb.asl b/src/mainboard/google/parrot/acpi/usb.asl
index ffdd67bbb1..8dd6dbb2d5 100644
--- a/src/mainboard/google/parrot/acpi/usb.asl
+++ b/src/mainboard/google/parrot/acpi/usb.asl
@@ -33,7 +33,7 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 		// Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (One))
+			Return (GPLD (1))
 		}
 
 	}
@@ -54,7 +54,7 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 		// Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (One))
+			Return (GPLD (1))
 		}
 	}
 
@@ -74,7 +74,7 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 		// Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (One))
+			Return (GPLD (1))
 		}
 	}
 
diff --git a/src/mainboard/google/rambi/variants/candy/include/variant/acpi/usb.asl b/src/mainboard/google/rambi/variants/candy/include/variant/acpi/usb.asl
index d953667643..5a9e1efa50 100644
--- a/src/mainboard/google/rambi/variants/candy/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/rambi/variants/candy/include/variant/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT1)
 	// Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.PRT2)
@@ -50,7 +50,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT2)
 		// Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (One))
+			Return (GPLD (1))
 		}
 	}
 
diff --git a/src/mainboard/google/rambi/variants/squawks/include/variant/acpi/usb.asl b/src/mainboard/google/rambi/variants/squawks/include/variant/acpi/usb.asl
index 0018a3538c..888ca5b841 100644
--- a/src/mainboard/google/rambi/variants/squawks/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/rambi/variants/squawks/include/variant/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT1)
 	// Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.PRT2)
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.RHUB.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.RHUB.PRT3)
diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/usb.asl b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/usb.asl
index 768a690e94..15a13286db 100644
--- a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/usb.asl
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
@@ -82,7 +82,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT5)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT7)
diff --git a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/usb.asl b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/usb.asl
index c8753fa09e..7dff13a3e3 100644
--- a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/usb.asl
+++ b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/usb.asl
@@ -14,7 +14,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT1)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
@@ -31,7 +31,7 @@ Scope (\_SB.PCI0.XHCI.HUB7.PRT2)
 	// Visible
 	Method (_PLD, 0, NotSerialized)
 	{
-		Return (GPLD (One))
+		Return (GPLD (1))
 	}
 }
 Scope (\_SB.PCI0.XHCI.HUB7.PRT3)
diff --git a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
index 2a58f9a3c4..cb488c23c6 100644
--- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
+++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
@@ -88,7 +88,7 @@ Scope (\_SB.PCI0.IPU0)
 				"data-lanes",
 				Package (0x04)
 				{
-					One,
+					1,
 					0x02,
 					0x03,
 					0x04
@@ -126,7 +126,7 @@ Scope (\_SB.PCI0.IPU0)
 				"data-lanes",
 				Package (0x02)
 				{
-					One,
+					1,
 					0x02
 				}
 			},
@@ -304,7 +304,7 @@ Scope (\_SB.PCI0.I2C3)
 					"data-lanes",
 					Package (0x04)
 					{
-						One,
+						1,
 						0x02,
 						0x03,
 						0x04
@@ -449,12 +449,12 @@ Scope (\_SB.PCI0.I2C3)
 				Package (0x02)
 				{
 					"pagesize",
-					One
+					1
 				},
 				Package (0x02)
 				{
 					"read-only",
-					One
+					1
 				},
 				Package (0x02)
 				{
@@ -622,7 +622,7 @@ Scope (\_SB.PCI0.I2C2)
 					"data-lanes",
 					Package (0x02)
 					{
-						One,
+						1,
 						0x02
 					}
 				},
@@ -640,7 +640,7 @@ Scope (\_SB.PCI0.I2C2)
 					Package (0x03)
 					{
 						IPU0,
-						One,
+						1,
 						Zero
 					}
 				}
diff --git a/src/mainboard/google/volteer/variants/voema/include/variant/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/voema/include/variant/acpi/mipi_camera.asl
index 4ef83fd33d..b2142b26fd 100644
--- a/src/mainboard/google/volteer/variants/voema/include/variant/acpi/mipi_camera.asl
+++ b/src/mainboard/google/volteer/variants/voema/include/variant/acpi/mipi_camera.asl
@@ -88,7 +88,7 @@ Scope (\_SB.PCI0.IPU0)
 				"data-lanes",
 				Package (0x02)
 				{
-					One,
+					1,
 					0x02
 				}
 			},
@@ -246,7 +246,7 @@ Scope (\_SB.PCI0.I2C2)
 					"data-lanes",
 					Package (0x02)
 					{
-						One,
+						1,
 						0x02
 					}
 				},
@@ -264,7 +264,7 @@ Scope (\_SB.PCI0.I2C2)
 					Package (0x03)
 					{
 						IPU0,
-						One,
+						1,
 						Zero
 					}
 				}
@@ -312,12 +312,12 @@ Scope (\_SB.PCI0.I2C2)
 				Package (0x02)
 				{
 					"pagesize",
-					One
+					1
 				},
 				Package (0x02)
 				{
 					"read-only",
-					One
+					1
 				},
 				Package (0x02)
 				{
diff --git a/src/mainboard/intel/baskingridge/acpi/thermal.asl b/src/mainboard/intel/baskingridge/acpi/thermal.asl
index c1bb1163ed..373683064a 100644
--- a/src/mainboard/intel/baskingridge/acpi/thermal.asl
+++ b/src/mainboard/intel/baskingridge/acpi/thermal.asl
@@ -101,7 +101,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -122,7 +122,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -143,7 +143,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -164,7 +164,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -185,7 +185,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
index 0a3bb49732..3d5b25061d 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
@@ -120,7 +120,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -141,7 +141,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -162,7 +162,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -183,7 +183,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -204,7 +204,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/intel/glkrvp/touchpad.asl b/src/mainboard/intel/glkrvp/touchpad.asl
index 14ed629334..57b9c7fa2e 100644
--- a/src/mainboard/intel/glkrvp/touchpad.asl
+++ b/src/mainboard/intel/glkrvp/touchpad.asl
@@ -3,7 +3,7 @@
 	{
 		Device (TPAD)
 		{
-		Name(_ADR, One)
+		Name(_ADR, 1)
 		Name (_HID, "ALPS0001")
 		Name (_CID, "PNP0C50")
 		Name (_DDN, "ALPS Touchpad")
@@ -41,22 +41,22 @@
 				If(Arg2 == Zero)
 				{
 					// Revision 1
-					If(Arg1 == One)
+					If(Arg1 == 1)
 					{
-						Return (Buffer (One) {0x03})
+						Return (Buffer (1) {0x03})
 					}
 					Else
 					{
-						Return (Buffer (One) {0x00})
+						Return (Buffer (1) {0x00})
 					}
-				} ElseIf (Arg2 == One) {  // Function 1 : HID Function
+				} ElseIf (Arg2 == 1) {  // Function 1 : HID Function
 			// HID Descriptor Address (IHV Specific)
 					Return(0x0020)
 				} Else {
-					Return (Buffer (One) {0x00})
+					Return (Buffer (1) {0x00})
 				}
 			} Else {
-				Return (Buffer (One) {0x00})
+				Return (Buffer (1) {0x00})
 			}
 		}
 	}
diff --git a/src/mainboard/intel/tglrvp/acpi/mipi_camera.asl b/src/mainboard/intel/tglrvp/acpi/mipi_camera.asl
index ffecfd2256..290069b269 100644
--- a/src/mainboard/intel/tglrvp/acpi/mipi_camera.asl
+++ b/src/mainboard/intel/tglrvp/acpi/mipi_camera.asl
@@ -28,7 +28,7 @@ Scope (\_SB.PCI0.IPU0)
 			Package (0x02)
 			{
 				"port",
-				One
+				1
 			}
 		},
 		ToUUID ("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
@@ -88,7 +88,7 @@ Scope (\_SB.PCI0.IPU0)
 				"data-lanes",
 				Package (0x04)
 				{
-					One,
+					1,
 					0x02,
 					0x03,
 					0x04
@@ -126,7 +126,7 @@ Scope (\_SB.PCI0.IPU0)
 				"data-lanes",
 				Package (0x04)
 				{
-					One,
+					1,
 					0x02,
 					0x03,
 					0x04
@@ -290,7 +290,7 @@ Scope (\_SB.PCI0.I2C3)
 					"data-lanes",
 					Package (0x04)
 					{
-						One,
+						1,
 						0x02,
 						0x03,
 						0x04
@@ -505,7 +505,7 @@ Scope (\_SB.PCI0.I2C5)
 					"data-lanes",
 					Package (0x04)
 					{
-						One,
+						1,
 						0x02,
 						0x03,
 						0x04
@@ -526,7 +526,7 @@ Scope (\_SB.PCI0.I2C5)
 					Package (0x03)
 					{
 						IPU0,
-						One,
+						1,
 						Zero
 					}
 				}
diff --git a/src/mainboard/intel/wtm2/acpi/thermal.asl b/src/mainboard/intel/wtm2/acpi/thermal.asl
index fe3961ef29..4d392430b1 100644
--- a/src/mainboard/intel/wtm2/acpi/thermal.asl
+++ b/src/mainboard/intel/wtm2/acpi/thermal.asl
@@ -103,7 +103,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -122,7 +122,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -141,7 +141,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -160,7 +160,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -179,7 +179,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/lenovo/s230u/acpi/gpe.asl b/src/mainboard/lenovo/s230u/acpi/gpe.asl
index 19531952f9..794358d458 100644
--- a/src/mainboard/lenovo/s230u/acpi/gpe.asl
+++ b/src/mainboard/lenovo/s230u/acpi/gpe.asl
@@ -17,7 +17,7 @@ Scope (_GPE)
 	}
 
 	Method (TINV, 2, Serialized) {
-		Local0 = One << Arg1
+		Local0 = 1 << Arg1
 		If (Arg0 == Zero) {
 			Local0 = ~Local0
 			GIV0 &= Local0
diff --git a/src/mainboard/lenovo/t400/acpi/graphics.asl b/src/mainboard/lenovo/t400/acpi/graphics.asl
index 5559bfcfa7..703e106129 100644
--- a/src/mainboard/lenovo/t400/acpi/graphics.asl
+++ b/src/mainboard/lenovo/t400/acpi/graphics.asl
@@ -26,7 +26,7 @@ Field (GPCM, ByteAcc, NoLock, Preserve) {
 
 Method(SHYB, 1) {
 	/* Switch hybrid graphics */
-	if (Arg0 == One)
+	if (Arg0 == 1)
 	{
 		/* Discrete graphics requested */
 		GPLV |= HYG1
diff --git a/src/mainboard/protectli/vault_bsw/acpi/superio.asl b/src/mainboard/protectli/vault_bsw/acpi/superio.asl
index 40303e10f8..46612cec7b 100644
--- a/src/mainboard/protectli/vault_bsw/acpi/superio.asl
+++ b/src/mainboard/protectli/vault_bsw/acpi/superio.asl
@@ -2,7 +2,7 @@
 
 Device (COM1) {
 	Name (_HID, EISAID ("PNP0501"))
-	Name (_UID, One)
+	Name (_UID, 1)
 
 	Method (_STA, 0, NotSerialized)
 	{
diff --git a/src/mainboard/purism/librem_bdw/acpi/ec.asl b/src/mainboard/purism/librem_bdw/acpi/ec.asl
index ea7b844c8d..b4bd878d34 100644
--- a/src/mainboard/purism/librem_bdw/acpi/ec.asl
+++ b/src/mainboard/purism/librem_bdw/acpi/ec.asl
@@ -2,7 +2,7 @@
 
 #define EC_SCI_GPI 10
 #define PPCM_TURBO Zero
-#define PPCM_NOTURBO One
+#define PPCM_NOTURBO 1
 #define CRIT_TEMP 105
 
 #include <ec/purism/librem/acpi/ec.asl>
diff --git a/src/mainboard/purism/librem_cnl/variants/librem_14/include/variant/acpi/gpe.asl b/src/mainboard/purism/librem_cnl/variants/librem_14/include/variant/acpi/gpe.asl
index 8045aaf402..94c0e40388 100644
--- a/src/mainboard/purism/librem_cnl/variants/librem_14/include/variant/acpi/gpe.asl
+++ b/src/mainboard/purism/librem_cnl/variants/librem_14/include/variant/acpi/gpe.asl
@@ -4,7 +4,7 @@
 Method (_L49, 0, Serialized) {
 	Printf ("GPE _L49: %o", ToHexString(\_SB.PCI0.LPCB.EC0.WFNO))
 	If (\_SB.PCI0.LPCB.EC0.ECOK) {
-		If (\_SB.PCI0.LPCB.EC0.WFNO == One) {
+		If (\_SB.PCI0.LPCB.EC0.WFNO == 1) {
 			Notify(\_SB.LID0, 0x80)
 		}
 	}
diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/acpi/variant.asl b/src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/acpi/variant.asl
index 4f4374e3b5..ea7be7dbe6 100644
--- a/src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/acpi/variant.asl
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/acpi/variant.asl
@@ -6,7 +6,7 @@ Scope (\_SB.PCI0.LPCB)
 	{
 		Name (_HID, "ACPI0003")
 		Name (_PCL, Package () { LPCB })
-		Name (ACFG, One)
+		Name (ACFG, 1)
 
 		Method (_PSR, 0, NotSerialized)
 		{
diff --git a/src/mainboard/purism/librem_skl/acpi/ec.asl b/src/mainboard/purism/librem_skl/acpi/ec.asl
index deee5fe308..54d225edf2 100644
--- a/src/mainboard/purism/librem_skl/acpi/ec.asl
+++ b/src/mainboard/purism/librem_skl/acpi/ec.asl
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #define EC_SCI_GPI 0x50
-#define PPCM_TURBO One
+#define PPCM_TURBO 1
 #define PPCM_NOTURBO 0x02
 #define CRIT_TEMP 100
 
diff --git a/src/mainboard/razer/blade_stealth_kbl/acpi/mainboard.asl b/src/mainboard/razer/blade_stealth_kbl/acpi/mainboard.asl
index be4aa5d281..997f4b1a30 100644
--- a/src/mainboard/razer/blade_stealth_kbl/acpi/mainboard.asl
+++ b/src/mainboard/razer/blade_stealth_kbl/acpi/mainboard.asl
@@ -10,7 +10,7 @@ Scope (\_SB)
 		{
 			if (\_SB.PCI0.LPCB.EC.LIDS > 1)
 			{
-				Return (One)
+				Return (1)
 			}
 			else
 			{
diff --git a/src/mainboard/samsung/lumpy/acpi/usb.asl b/src/mainboard/samsung/lumpy/acpi/usb.asl
index 4b640655aa..986ab5b0f9 100644
--- a/src/mainboard/samsung/lumpy/acpi/usb.asl
+++ b/src/mainboard/samsung/lumpy/acpi/usb.asl
@@ -33,7 +33,7 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 		// Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (One))
+			Return (GPLD (1))
 		}
 
 	}
@@ -54,7 +54,7 @@ Scope (\_SB.PCI0.EHC1.HUB7.PRT1)
 		// Visible
 		Method (_PLD, 0, NotSerialized)  // _PLD: Physical Location of Device
 		{
-			Return (GPLD (One))
+			Return (GPLD (1))
 		}
 	}
 
diff --git a/src/mainboard/samsung/stumpy/acpi/thermal.asl b/src/mainboard/samsung/stumpy/acpi/thermal.asl
index cf44aba767..44bf558799 100644
--- a/src/mainboard/samsung/stumpy/acpi/thermal.asl
+++ b/src/mainboard/samsung/stumpy/acpi/thermal.asl
@@ -119,7 +119,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 0) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -140,7 +140,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 1) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -161,7 +161,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 2) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -182,7 +182,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 3) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
@@ -203,7 +203,7 @@ Scope (\_TZ)
 		{
 			Method (_STA) {
 				If (\FLVL <= 4) {
-					Return (One)
+					Return (1)
 				} Else {
 					Return (Zero)
 				}
diff --git a/src/mainboard/starlabs/lite/acpi/touchpad.asl b/src/mainboard/starlabs/lite/acpi/touchpad.asl
index f73847c35d..cb003aeab4 100644
--- a/src/mainboard/starlabs/lite/acpi/touchpad.asl
+++ b/src/mainboard/starlabs/lite/acpi/touchpad.asl
@@ -39,7 +39,7 @@ Scope (\_SB.PCI0.I2C7)
 				Package (0x02)
 				{
 					"linux,probed",
-					One
+					1
 				}
 			}
 		})
diff --git a/src/mainboard/system76/kbl-u/acpi/ac.asl b/src/mainboard/system76/kbl-u/acpi/ac.asl
index 7326676198..b417e03c53 100644
--- a/src/mainboard/system76/kbl-u/acpi/ac.asl
+++ b/src/mainboard/system76/kbl-u/acpi/ac.asl
@@ -8,7 +8,7 @@ Device (AC)
 		_SB
 	})
 
-	Name (ACFG, One)
+	Name (ACFG, 1)
 
 	Method (_PSR, 0, NotSerialized)  // _PSR: Power Source
 	{
diff --git a/src/mainboard/system76/kbl-u/acpi/battery.asl b/src/mainboard/system76/kbl-u/acpi/battery.asl
index f3a8a9adb7..ec1ef31265 100644
--- a/src/mainboard/system76/kbl-u/acpi/battery.asl
+++ b/src/mainboard/system76/kbl-u/acpi/battery.asl
@@ -30,10 +30,10 @@ Device (BAT0)
 
 	Name (PBIF, Package (0x0D)
 	{
-		One, // 0 - Power Unit
+		1, // 0 - Power Unit
 		0xFFFFFFFF, // 1 - Design Capacity
 		0xFFFFFFFF, // 2 - Last Full Charge Capacity
-		One, // 3 - Battery Technology
+		1, // 3 - Battery Technology
 		0x39D0, // 4 - Design Voltage
 		Zero, // 5 - Design Capacity of Warning
 		Zero, // 6 - Design Capacity of Low
@@ -127,7 +127,7 @@ Device (BAT0)
 			}
 			Else
 			{
-				Local0 |= One
+				Local0 |= 1
 				Local1 = (^^PCI0.LPCB.EC0.BPR0 & 0xFFFF)
 			}
 
diff --git a/src/mainboard/system76/kbl-u/acpi/ec.asl b/src/mainboard/system76/kbl-u/acpi/ec.asl
index de25eca129..ff31c01c9c 100644
--- a/src/mainboard/system76/kbl-u/acpi/ec.asl
+++ b/src/mainboard/system76/kbl-u/acpi/ec.asl
@@ -26,7 +26,7 @@ Device (EC0)
 	Method (_REG, 2, Serialized)  // _REG: Region Availability
 	{
 		Debug = Concatenate("EC: _REG", Concatenate(ToHexString(Arg0), Concatenate(" ", ToHexString(Arg1))))
-		If ((Arg0 == 0x03) && (Arg1 == One)) {
+		If ((Arg0 == 0x03) && (Arg1 == 1)) {
 			// Enable hardware touchpad lock, airplane mode, and keyboard backlight keys
 			ECOS = 1
 
diff --git a/src/mainboard/system76/kbl-u/acpi/hid.asl b/src/mainboard/system76/kbl-u/acpi/hid.asl
index 6610c2e1bc..8bbb65bc45 100644
--- a/src/mainboard/system76/kbl-u/acpi/hid.asl
+++ b/src/mainboard/system76/kbl-u/acpi/hid.asl
@@ -25,7 +25,7 @@ Device (HIDD)
 
 	Method (HPEM, 1, Serialized)
 	{
-		HBSY = One
+		HBSY = 1
 		HIDX = Arg0
 
 		Notify (HIDD, 0xC0)
@@ -36,11 +36,11 @@ Device (HIDD)
 			Local0++
 		}
 
-		If (HBSY == One)
+		If (HBSY == 1)
 		{
 			HBSY = Zero
 			HIDX = Zero
-			Return (One)
+			Return (1)
 		}
 		Else
 		{
diff --git a/src/mainboard/system76/kbl-u/acpi/lid.asl b/src/mainboard/system76/kbl-u/acpi/lid.asl
index 582c38d87c..067c96f32b 100644
--- a/src/mainboard/system76/kbl-u/acpi/lid.asl
+++ b/src/mainboard/system76/kbl-u/acpi/lid.asl
@@ -10,7 +10,7 @@ Device (LID0)
 		If (^^PCI0.LPCB.EC0.ECOK) {
 			Return (^^PCI0.LPCB.EC0.LSTE)
 		} Else {
-			Return (One)
+			Return (1)
 		}
 	}
 
diff --git a/src/mainboard/system76/kbl-u/acpi/s76.asl b/src/mainboard/system76/kbl-u/acpi/s76.asl
index 399e569734..c4f7837e69 100644
--- a/src/mainboard/system76/kbl-u/acpi/s76.asl
+++ b/src/mainboard/system76/kbl-u/acpi/s76.asl
@@ -65,7 +65,7 @@ Device (S76D) {
 	Method (GKBL, 0, Serialized) {
 		Local0 = 0
 		If (^^PCI0.LPCB.EC0.ECOK) {
-			^^PCI0.LPCB.EC0.FDAT = One
+			^^PCI0.LPCB.EC0.FDAT = 1
 			^^PCI0.LPCB.EC0.FCMD = 0xCA
 			Local0 = ^^PCI0.LPCB.EC0.FBUF
 			^^PCI0.LPCB.EC0.FCMD = Zero