diff options
| author | Frans Hendriks <fhendriks@eltan.com> | 2019-12-06 16:04:50 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-12-11 11:36:08 +0000 |
| commit | c1c5354e45a0a369ffa7371468bef05ba552909f (patch) | |
| tree | eb5dd1dd8efb7f5c67d26acf9fece96fc64e81b7 | |
| parent | c8e1c0d3952cb678203f6c62047ac4bee9809748 (diff) | |
mb/{facebook/portwell}: Define SDCARD_CD in dsdt.asl
SDCARD_CD is defined in onboard.h but required in ASL only, move this
define to dsdt.asl.
Removed the onboard.h file from the ASL files that don use it.
BUG=N/A
TEST=build
Change-Id: I35b75e0ae2e2bc4ce143aaec6df6016774676095
Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37610
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
| -rw-r--r-- | src/mainboard/facebook/fbg1701/acpi/mainboard.asl | 2 | ||||
| -rw-r--r-- | src/mainboard/facebook/fbg1701/acpi/superio.asl | 3 | ||||
| -rw-r--r-- | src/mainboard/facebook/fbg1701/dsdt.asl | 2 | ||||
| -rw-r--r-- | src/mainboard/facebook/fbg1701/onboard.h | 3 | ||||
| -rw-r--r-- | src/mainboard/portwell/m107/acpi/superio.asl | 2 | ||||
| -rw-r--r-- | src/mainboard/portwell/m107/dsdt.asl | 2 |
6 files changed, 4 insertions, 10 deletions
diff --git a/src/mainboard/facebook/fbg1701/acpi/mainboard.asl b/src/mainboard/facebook/fbg1701/acpi/mainboard.asl index 9575748446..af79bd76af 100644 --- a/src/mainboard/facebook/fbg1701/acpi/mainboard.asl +++ b/src/mainboard/facebook/fbg1701/acpi/mainboard.asl @@ -16,8 +16,6 @@ * GNU General Public License for more details. */ -#include "onboard.h" - Scope (\_SB) { Device (PWRB) diff --git a/src/mainboard/facebook/fbg1701/acpi/superio.asl b/src/mainboard/facebook/fbg1701/acpi/superio.asl index bdaa912fd7..4fa6772128 100644 --- a/src/mainboard/facebook/fbg1701/acpi/superio.asl +++ b/src/mainboard/facebook/fbg1701/acpi/superio.asl @@ -15,9 +15,6 @@ * GNU General Public License for more details. */ -/* mainboard configuration */ -#include "onboard.h" - Device (COM1) { Name (_HID, EISAID ("PNP0501")) Name (_UID, 1) diff --git a/src/mainboard/facebook/fbg1701/dsdt.asl b/src/mainboard/facebook/fbg1701/dsdt.asl index 4eea7b93f4..518e249197 100644 --- a/src/mainboard/facebook/fbg1701/dsdt.asl +++ b/src/mainboard/facebook/fbg1701/dsdt.asl @@ -18,6 +18,8 @@ #include <arch/acpi.h> +#define SDCARD_CD 81 /* Not used */ + DefinitionBlock( "dsdt.aml", "DSDT", diff --git a/src/mainboard/facebook/fbg1701/onboard.h b/src/mainboard/facebook/fbg1701/onboard.h index 6e094ab6e9..715f76a39d 100644 --- a/src/mainboard/facebook/fbg1701/onboard.h +++ b/src/mainboard/facebook/fbg1701/onboard.h @@ -18,9 +18,6 @@ #ifndef ONBOARD_H #define ONBOARD_H -/* SD CARD gpio */ -#define SDCARD_CD 81 /* Not used */ - /* Define the items to be measured or verified */ #define FSP (const char *)"fsp.bin" #define CMOS_LAYOUT (const char *)"cmos_layout.bin" diff --git a/src/mainboard/portwell/m107/acpi/superio.asl b/src/mainboard/portwell/m107/acpi/superio.asl index e411f721dc..309a26bb13 100644 --- a/src/mainboard/portwell/m107/acpi/superio.asl +++ b/src/mainboard/portwell/m107/acpi/superio.asl @@ -15,8 +15,6 @@ * GNU General Public License for more details. */ -/* mainboard configuration */ -#include "onboard.h" Device (COM1) { Name (_HID, EISAID ("PNP0501")) diff --git a/src/mainboard/portwell/m107/dsdt.asl b/src/mainboard/portwell/m107/dsdt.asl index 4eea7b93f4..518e249197 100644 --- a/src/mainboard/portwell/m107/dsdt.asl +++ b/src/mainboard/portwell/m107/dsdt.asl @@ -18,6 +18,8 @@ #include <arch/acpi.h> +#define SDCARD_CD 81 /* Not used */ + DefinitionBlock( "dsdt.aml", "DSDT", |