summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorWim Vervoorn <wvervoorn@eltan.com>2020-01-16 10:28:14 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-01-22 15:41:18 +0000
commit13471bc86454ec33ca1550706d62386625e7fed1 (patch)
tree6a7f59b7484a21363b1f2edf89afada95275fe99 /src/mainboard
parentb362938befe20052ea7a286160f288f165ecc26f (diff)
downloadcoreboot-13471bc86454ec33ca1550706d62386625e7fed1.tar.xz
mb/facebook/fbg1701: Remove ACPI S4 support
Align the fbg1701 sleepstates implementation with monolith. BUG=N/A TEST=build Change-Id: I3a715781bf51da41d6954463ad38ed94b0dfd217 Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38448 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/facebook/fbg1701/Kconfig1
-rw-r--r--src/mainboard/facebook/fbg1701/acpi/sleepstates.asl20
-rw-r--r--src/mainboard/facebook/fbg1701/dsdt.asl5
3 files changed, 4 insertions, 22 deletions
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index dc8dc26c81..abccfe1371 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -18,6 +18,7 @@ if BOARD_FACEBOOK_FBG1701
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_8192
+ select DISABLE_ACPI_HIBERNATE
select HAVE_ACPI_TABLES
select HAVE_IFD_BIN
select HAVE_ME_BIN
diff --git a/src/mainboard/facebook/fbg1701/acpi/sleepstates.asl b/src/mainboard/facebook/fbg1701/acpi/sleepstates.asl
deleted file mode 100644
index 428fda2a01..0000000000
--- a/src/mainboard/facebook/fbg1701/acpi/sleepstates.asl
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- * Copyright (C) 2018 Eltan B.V.
- *
- * 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.
- */
-
-Name(\_S0, Package(){0x0,0x0,0x0,0x0})
-Name(\_S4, Package(){0x6,0x6,0x0,0x0})
-Name(\_S5, Package(){0x7,0x7,0x0,0x0})
diff --git a/src/mainboard/facebook/fbg1701/dsdt.asl b/src/mainboard/facebook/fbg1701/dsdt.asl
index 6fcb39af2f..707e48b504 100644
--- a/src/mainboard/facebook/fbg1701/dsdt.asl
+++ b/src/mainboard/facebook/fbg1701/dsdt.asl
@@ -43,7 +43,8 @@ DefinitionBlock(
}
}
- /* Mainboard specific sleep states */
- #include "acpi/sleepstates.asl"
+ #include <southbridge/intel/common/acpi/sleepstates.asl>
+
+ /* Mainboard specific */
#include "acpi/mainboard.asl"
}