From e0a6ee888096a74791196c3b2a627afebb0ccd2c Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 7 Nov 2017 13:45:29 -0700 Subject: mainboard/google/kahlee: Move usb_oc.asl into variant/acpi This compares to the acpi directory in other variants. BUG=b:68293392 TEST=Build and boot kahlee Change-Id: I05d402995b280d6f020bc2575063dbffefa30670 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/22372 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/kahlee/dsdt.asl | 2 +- .../kahlee/variants/kahlee/include/acpi/usb_oc.asl | 37 ---------------------- .../kahlee/include/variant/acpi/usb_oc.asl | 37 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 src/mainboard/google/kahlee/variants/kahlee/include/acpi/usb_oc.asl create mode 100644 src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/usb_oc.asl diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl index 717d4bbfd0..f3f8aaafd2 100644 --- a/src/mainboard/google/kahlee/dsdt.asl +++ b/src/mainboard/google/kahlee/dsdt.asl @@ -34,7 +34,7 @@ DefinitionBlock ( #include "acpi/mainboard.asl" /* Describe the USB Overcurrent pins */ - #include "acpi/usb_oc.asl" + #include "variant/acpi/usb_oc.asl" /* PCI IRQ mapping for the Southbridge */ #include diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/acpi/usb_oc.asl b/src/mainboard/google/kahlee/variants/kahlee/include/acpi/usb_oc.asl deleted file mode 100644 index 068d6fd96d..0000000000 --- a/src/mainboard/google/kahlee/variants/kahlee/include/acpi/usb_oc.asl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Advanced Micro Devices, Inc. - * Copyright (C) 2013 Sage Electronic Engineering, LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* simple name description */ -/* - * DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) - * { - * #include "usb.asl" - * } - */ - -/* USB overcurrent mapping pins. */ -Name (UOM0, 0) -Name (UOM1, 2) -Name (UOM2, 0) -Name (UOM3, 7) -Name (UOM4, 2) -Name (UOM5, 2) -Name (UOM6, 6) -Name (UOM7, 2) -Name (UOM8, 6) -Name (UOM9, 6) - -/* USB Overcurrent GPEs */ diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/usb_oc.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/usb_oc.asl new file mode 100644 index 0000000000..068d6fd96d --- /dev/null +++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/usb_oc.asl @@ -0,0 +1,37 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2015 Advanced Micro Devices, Inc. + * Copyright (C) 2013 Sage Electronic Engineering, LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* simple name description */ +/* + * DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001) + * { + * #include "usb.asl" + * } + */ + +/* USB overcurrent mapping pins. */ +Name (UOM0, 0) +Name (UOM1, 2) +Name (UOM2, 0) +Name (UOM3, 7) +Name (UOM4, 2) +Name (UOM5, 2) +Name (UOM6, 6) +Name (UOM7, 2) +Name (UOM8, 6) +Name (UOM9, 6) + +/* USB Overcurrent GPEs */ -- cgit v1.2.3