From a0b4a8d8197421b6454d0614deeef1eef575bdd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 15 Jun 2014 14:28:23 +0300 Subject: ACPI: Remove CBMEM TOC from GNVS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This existed for ChromeOS but was no longer used with DYNAMIC_CBMEM. Change-Id: I558a7ae333e5874670206e20a147dd6598a3a5e7 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6032 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- 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(-) (limited to 'src') diff --git a/src/mainboard/google/bolt/acpi_tables.c b/src/mainboard/google/bolt/acpi_tables.c index 7a3ccea50c..7f596b707c 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 95b45db802..25d8fa171f 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 ba084a11d9..d01e785e3b 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 dbbde685ed..36c0c04f37 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 45a9948bff..e1262167ea 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 4d862ca29a..8cac25038f 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 1d96decdcc..7c0c646f67 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 7a3ccea50c..7f596b707c 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 d600aec5ac..667bacfa14 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 f4b74bc83a..e1a65b0892 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 8a9d8576ae..5f81e2604a 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 211dc2d888..60ad5c82d2 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 6e327799ed..e914b9b688 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 357e710e4f..cf7594964f 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 ed6d35775a..cf28f8ba33 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 6ee2df858a..5dfae0a56f 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 6ee2df858a..5dfae0a56f 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 6ee2df858a..5dfae0a56f 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 4aeccbc1c7..96f89b7081 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 b68edcd90e..cf1473a26c 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 09dee3a53d..dbf72e21ae 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 1e123109c8..53c4a64887 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 7b8b6c9e9c..1038f7369a 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 b8506d4db4..8889f02f27 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 7b8b6c9e9c..1038f7369a 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 4283ca13d5..48010ffeb7 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 */ -- cgit v1.2.3