From 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Wed, 03 Sep 2014 14:30:21 -0400
Subject: Merge libreboot-6b6.

Conflicts:
	buildrom-withgrub
---
(limited to 'docs/future/donotusethis_macbook_acpi.diff')

diff --git a/docs/future/donotusethis_macbook_acpi.diff b/docs/future/donotusethis_macbook_acpi.diff
new file mode 100644
index 0000000..61a55c6
--- /dev/null
+++ b/docs/future/donotusethis_macbook_acpi.diff
@@ -0,0 +1,28 @@
+diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
+index 9a025dd..a2adb76 100644
+--- a/src/mainboard/apple/macbook21/mainboard.c
++++ b/src/mainboard/apple/macbook21/mainboard.c
+@@ -40,6 +40,12 @@
+ extern const u32 *cim_verb_data;
+ extern u32 cim_verb_data_size;
+ 
++static acpi_cstate_t cst_entries[] = {
++        { 1,  1, 1000, { 0x7f, 1, 2, { 0 }, 1, 0 } },
++        { 2,  1,  500, { 0x01, 8, 0, { 0 }, DEFAULT_PMBASE + LV2, 0 } },
++        { 2, 17,  250, { 0x01, 8, 0, { 0 }, DEFAULT_PMBASE + LV3, 0 } },
++};
++
+ #if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
+ static int int15_handler(void)
+ {
+@@ -73,7 +79,8 @@ static int int15_handler(void)
+ 
+ int get_cst_entries(acpi_cstate_t **entries)
+ {
+-       return 0;
++        *entries = cst_entries;
++        return ARRAY_SIZE(cst_entries);
+ }
+ 
+ static void mainboard_init(device_t dev)
+
--
cgit v0.9.1