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@gmail.com>
Reviewed-on: http://review.coreboot.org/6032
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>

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;
 

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;

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;
 

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;

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;

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;
 

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();
 

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;
 

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;

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;
 

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)

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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];

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];

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 */

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 */

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 */

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 */