[coreboot-gerrit] Patch set updated for coreboot: 53fa2dc ACPI: Remove CBMEM TOC from GNVS
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Sun Jun 15 18:22:53 CEST 2014
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6032
-gerrit
commit 53fa2dccacdff958ee2336080ec0174894593467
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Sun Jun 15 14:28:23 2014 +0300
ACPI: Remove CBMEM TOC from GNVS
This existed for ChromeOS but was no longer used with DYNAMIC_CBMEM.
Change-Id: I558a7ae333e5874670206e20a147dd6598a3a5e7
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/mainboard/google/bolt/acpi_tables.c | 3 ---
src/mainboard/google/butterfly/acpi_tables.c | 3 ---
src/mainboard/google/falco/acpi_tables.c | 3 ---
src/mainboard/google/link/acpi_tables.c | 3 ---
src/mainboard/google/parrot/acpi_tables.c | 3 ---
src/mainboard/google/peppy/acpi_tables.c | 3 ---
src/mainboard/google/rambi/acpi_tables.c | 3 ---
src/mainboard/google/slippy/acpi_tables.c | 3 ---
src/mainboard/google/stout/acpi_tables.c | 3 ---
src/mainboard/intel/baskingridge/acpi_tables.c | 3 ---
src/mainboard/intel/bayleybay_fsp/acpi_tables.c | 3 ---
src/mainboard/intel/cougar_canyon2/acpi_tables.c | 3 ---
src/mainboard/intel/emeraldlake2/acpi_tables.c | 3 ---
src/mainboard/intel/wtm2/acpi_tables.c | 3 ---
src/mainboard/kontron/ktqm77/acpi_tables.c | 3 ---
src/mainboard/lenovo/t520/acpi_tables.c | 3 ---
src/mainboard/lenovo/t530/acpi_tables.c | 3 ---
src/mainboard/lenovo/x230/acpi_tables.c | 3 ---
src/mainboard/samsung/lumpy/acpi_tables.c | 3 ---
src/mainboard/samsung/stumpy/acpi_tables.c | 3 ---
src/soc/intel/baytrail/baytrail/nvs.h | 2 +-
src/soc/intel/fsp_baytrail/baytrail/nvs.h | 2 +-
src/southbridge/intel/bd82x6x/nvs.h | 2 +-
src/southbridge/intel/fsp_bd82x6x/nvs.h | 2 +-
src/southbridge/intel/ibexpeak/nvs.h | 2 +-
src/southbridge/intel/lynxpoint/nvs.h | 2 +-
26 files changed, 6 insertions(+), 66 deletions(-)
diff --git a/src/mainboard/google/bolt/acpi_tables.c b/src/mainboard/google/bolt/acpi_tables.c
index 7a3ccea..7f596b7 100644
--- a/src/mainboard/google/bolt/acpi_tables.c
+++ b/src/mainboard/google/bolt/acpi_tables.c
@@ -72,9 +72,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = 0;
-
/* TPM Present */
gnvs->tpmp = 1;
diff --git a/src/mainboard/google/butterfly/acpi_tables.c b/src/mainboard/google/butterfly/acpi_tables.c
index 95b45db..25d8fa1 100644
--- a/src/mainboard/google/butterfly/acpi_tables.c
+++ b/src/mainboard/google/butterfly/acpi_tables.c
@@ -64,9 +64,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/google/falco/acpi_tables.c b/src/mainboard/google/falco/acpi_tables.c
index ba084a1..d01e785 100644
--- a/src/mainboard/google/falco/acpi_tables.c
+++ b/src/mainboard/google/falco/acpi_tables.c
@@ -66,9 +66,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = 0;
-
/* TPM Present */
gnvs->tpmp = 1;
diff --git a/src/mainboard/google/link/acpi_tables.c b/src/mainboard/google/link/acpi_tables.c
index dbbde68..36c0c04 100644
--- a/src/mainboard/google/link/acpi_tables.c
+++ b/src/mainboard/google/link/acpi_tables.c
@@ -74,9 +74,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs, igd_opregion_t *opregion)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 1;
gnvs->did[0] = 0x80000000;
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index 45a9948..e126216 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -65,9 +65,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/google/peppy/acpi_tables.c b/src/mainboard/google/peppy/acpi_tables.c
index 4d862ca..8cac250 100644
--- a/src/mainboard/google/peppy/acpi_tables.c
+++ b/src/mainboard/google/peppy/acpi_tables.c
@@ -75,9 +75,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = 0;
-
/* TPM Present */
gnvs->tpmp = 1;
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index 1d96dec..7c0c646 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -52,9 +52,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = 0;
-
/* Top of Low Memory (start of resource allocation) */
gnvs->tolm = nc_read_top_of_low_memory();
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index 7a3ccea..7f596b7 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -72,9 +72,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = 0;
-
/* TPM Present */
gnvs->tpmp = 1;
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index d600aec..667bacf 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -68,9 +68,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index f4b74bc..e1a65b0 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -85,9 +85,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 1;
gnvs->s5u1 = 1;
- /* CBMEM TOC */
- gnvs->cmem = 0;
-
/* TPM Present */
gnvs->tpmp = 1;
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index 8a9d857..5f81e26 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -55,9 +55,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
/* Enable DPTF */
gnvs->dpte = 0;
-
- /* CBMEM TOC */
- gnvs->cmem = 0;
}
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/intel/cougar_canyon2/acpi_tables.c b/src/mainboard/intel/cougar_canyon2/acpi_tables.c
index 211dc2d..60ad5c8 100644
--- a/src/mainboard/intel/cougar_canyon2/acpi_tables.c
+++ b/src/mainboard/intel/cougar_canyon2/acpi_tables.c
@@ -67,9 +67,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 1;
gnvs->s5u1 = 1;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 6e32779..e914b9b 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -87,9 +87,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 1;
gnvs->s5u1 = 1;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index 357e710..cf75949 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -82,9 +82,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = 0;
-
/* TPM Present */
gnvs->tpmp = 1;
diff --git a/src/mainboard/kontron/ktqm77/acpi_tables.c b/src/mainboard/kontron/ktqm77/acpi_tables.c
index ed6d357..cf28f8b 100644
--- a/src/mainboard/kontron/ktqm77/acpi_tables.c
+++ b/src/mainboard/kontron/ktqm77/acpi_tables.c
@@ -62,9 +62,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 0;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/lenovo/t520/acpi_tables.c b/src/mainboard/lenovo/t520/acpi_tables.c
index 6ee2df8..5dfae0a 100644
--- a/src/mainboard/lenovo/t520/acpi_tables.c
+++ b/src/mainboard/lenovo/t520/acpi_tables.c
@@ -61,9 +61,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/lenovo/t530/acpi_tables.c b/src/mainboard/lenovo/t530/acpi_tables.c
index 6ee2df8..5dfae0a 100644
--- a/src/mainboard/lenovo/t530/acpi_tables.c
+++ b/src/mainboard/lenovo/t530/acpi_tables.c
@@ -61,9 +61,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/lenovo/x230/acpi_tables.c b/src/mainboard/lenovo/x230/acpi_tables.c
index 6ee2df8..5dfae0a 100644
--- a/src/mainboard/lenovo/x230/acpi_tables.c
+++ b/src/mainboard/lenovo/x230/acpi_tables.c
@@ -61,9 +61,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index 4aeccbc..96f89b7 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -89,9 +89,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 0;
gnvs->s5u1 = 0;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index b68edcd..cf1473a 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -88,9 +88,6 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->s5u0 = 1;
gnvs->s5u1 = 1;
- /* CBMEM TOC */
- gnvs->cmem = (u32)get_cbmem_toc();
-
/* IGD Displays */
gnvs->ndid = 3;
gnvs->did[0] = 0x80000100;
diff --git a/src/soc/intel/baytrail/baytrail/nvs.h b/src/soc/intel/baytrail/baytrail/nvs.h
index 09dee3a..dbf72e2 100644
--- a/src/soc/intel/baytrail/baytrail/nvs.h
+++ b/src/soc/intel/baytrail/baytrail/nvs.h
@@ -54,7 +54,7 @@ typedef struct {
u8 rsvd2[8];
/* Base Addresses */
- u32 cmem; /* 0x30 - CBMEM TOC */
+ u32 obsolete_cmem; /* 0x30 - CBMEM TOC */
u32 tolm; /* 0x34 - Top of Low Memory */
u32 cbmc; /* 0x38 - coreboot memconsole */
u8 rsvd3[196];
diff --git a/src/soc/intel/fsp_baytrail/baytrail/nvs.h b/src/soc/intel/fsp_baytrail/baytrail/nvs.h
index 1e12310..53c4a64 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/nvs.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/nvs.h
@@ -56,7 +56,7 @@ typedef struct {
u8 rsvd2[8];
/* Base Addresses */
- u32 cmem; /* 0x30 - CBMEM TOC */
+ u32 obsolete_cmem; /* 0x30 - CBMEM TOC */
u32 tolm; /* 0x34 - Top of Low Memory */
u32 cbmc; /* 0x38 - coreboot memconsole */
u8 rsvd3[196];
diff --git a/src/southbridge/intel/bd82x6x/nvs.h b/src/southbridge/intel/bd82x6x/nvs.h
index 7b8b6c9..1038f73 100644
--- a/src/southbridge/intel/bd82x6x/nvs.h
+++ b/src/southbridge/intel/bd82x6x/nvs.h
@@ -72,7 +72,7 @@ typedef struct {
u8 s3u0; /* 0x35 - Enable USB0 in S3 */
u8 s3u1; /* 0x36 - Enable USB1 in S3 */
u8 s33g; /* 0x37 - Enable S3 in 3G */
- u32 cmem; /* 0x38 - CBMEM TOC */
+ u32 obsolete_cmem; /* 0x38 - CBMEM TOC */
/* Integrated Graphics Device */
u8 igds; /* 0x3c - IGD state */
u8 tlst; /* 0x3d - Display Toggle List Pointer */
diff --git a/src/southbridge/intel/fsp_bd82x6x/nvs.h b/src/southbridge/intel/fsp_bd82x6x/nvs.h
index b8506d4..8889f02 100644
--- a/src/southbridge/intel/fsp_bd82x6x/nvs.h
+++ b/src/southbridge/intel/fsp_bd82x6x/nvs.h
@@ -72,7 +72,7 @@ typedef struct {
u8 s3u0; /* 0x35 - Enable USB0 in S3 */
u8 s3u1; /* 0x36 - Enable USB1 in S3 */
u8 s33g; /* 0x37 - Enable S3 in 3G */
- u32 cmem; /* 0x38 - CBMEM TOC */
+ u32 obsolete_cmem; /* 0x38 - CBMEM TOC */
/* Integrated Graphics Device */
u8 igds; /* 0x3c - IGD state */
u8 tlst; /* 0x3d - Display Toggle List Pointer */
diff --git a/src/southbridge/intel/ibexpeak/nvs.h b/src/southbridge/intel/ibexpeak/nvs.h
index 7b8b6c9..1038f73 100644
--- a/src/southbridge/intel/ibexpeak/nvs.h
+++ b/src/southbridge/intel/ibexpeak/nvs.h
@@ -72,7 +72,7 @@ typedef struct {
u8 s3u0; /* 0x35 - Enable USB0 in S3 */
u8 s3u1; /* 0x36 - Enable USB1 in S3 */
u8 s33g; /* 0x37 - Enable S3 in 3G */
- u32 cmem; /* 0x38 - CBMEM TOC */
+ u32 obsolete_cmem; /* 0x38 - CBMEM TOC */
/* Integrated Graphics Device */
u8 igds; /* 0x3c - IGD state */
u8 tlst; /* 0x3d - Display Toggle List Pointer */
diff --git a/src/southbridge/intel/lynxpoint/nvs.h b/src/southbridge/intel/lynxpoint/nvs.h
index 4283ca1..48010ff 100644
--- a/src/southbridge/intel/lynxpoint/nvs.h
+++ b/src/southbridge/intel/lynxpoint/nvs.h
@@ -72,7 +72,7 @@ typedef struct {
u8 s3u0; /* 0x35 - Enable USB0 in S3 */
u8 s3u1; /* 0x36 - Enable USB1 in S3 */
u8 s33g; /* 0x37 - Enable S3 in 3G */
- u32 cmem; /* 0x38 - CBMEM TOC */
+ u32 obsolete_cmem; /* 0x38 - CBMEM TOC */
/* Integrated Graphics Device */
u8 igds; /* 0x3c - IGD state */
u8 tlst; /* 0x3d - Display Toggle List Pointer */
More information about the coreboot-gerrit
mailing list