From 3cbf8d955f48fc39d5b3087934cbc5739ba07c5a Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Thu, 28 Jan 2016 10:26:31 -0800 Subject: chromeos: Remove CONFIG_VBNV_SIZE variable The VBNV region size is determined by vboot and is not really configurable. Only the CMOS implementation defined this config variable so switch it to use VBNV_BLOCK_SIZE defined by vboot in vbnv_layout.h instead. This requires updating the broadwell/skylake cmos reset functions to use the right constant. BUG=chrome-os-partner:47915 BRANCH=glados TEST=manually tested on chell Change-Id: I45e3efc2a22efcb1470bbbefbdae4eda33fc6c96 Signed-off-by: Patrick Georgi Original-Commit-Id: e2b803ff3ac30ab22d65d1e62aca623730999a1d Original-Change-Id: I4896a1a5b7889d77ad00c4c8f285d184c4218e17 Original-Signed-off-by: Duncan Laurie Original-Reviewed-on: https://chromium-review.googlesource.com/324520 Original-Reviewed-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/13598 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/vendorcode/google/chromeos/Kconfig | 8 -------- src/vendorcode/google/chromeos/acpi/chromeos.asl | 4 +++- src/vendorcode/google/chromeos/vbnv_cmos.c | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) (limited to 'src/vendorcode/google/chromeos') diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index a7219bd2c1..79d6918e96 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -44,14 +44,6 @@ config VBNV_OFFSET CMOS offset for VbNv data. This value must match cmos.layout in the mainboard directory, minus 14 bytes for the RTC. -config VBNV_SIZE - hex - default 0x10 - depends on PC80_SYSTEM - help - CMOS storage size for VbNv data. This value must match cmos.layout - in the mainboard directory. - config CHROMEOS_VBNV_CMOS bool "Vboot non-volatile storage in CMOS." default n diff --git a/src/vendorcode/google/chromeos/acpi/chromeos.asl b/src/vendorcode/google/chromeos/acpi/chromeos.asl index 5b2a26e93e..66ebbc1819 100644 --- a/src/vendorcode/google/chromeos/acpi/chromeos.asl +++ b/src/vendorcode/google/chromeos/acpi/chromeos.asl @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include + Device (CRHW) { Name(_HID, EISAID("GGL0001")) @@ -70,7 +72,7 @@ Device (CRHW) // See src/vendorcode/google/chromeos/Kconfig // for the definition of these: CONFIG_VBNV_OFFSET, - CONFIG_VBNV_SIZE + VBNV_BLOCK_SIZE }) Return(VNBV) } diff --git a/src/vendorcode/google/chromeos/vbnv_cmos.c b/src/vendorcode/google/chromeos/vbnv_cmos.c index ddcb765fc7..e0d7ba1ea3 100644 --- a/src/vendorcode/google/chromeos/vbnv_cmos.c +++ b/src/vendorcode/google/chromeos/vbnv_cmos.c @@ -22,7 +22,7 @@ void read_vbnv_cmos(uint8_t *vbnv_copy) { int i; - for (i = 0; i < CONFIG_VBNV_SIZE; i++) + for (i = 0; i < VBNV_BLOCK_SIZE; i++) vbnv_copy[i] = cmos_read(CONFIG_VBNV_OFFSET + 14 + i); } @@ -30,6 +30,6 @@ void save_vbnv_cmos(const uint8_t *vbnv_copy) { int i; - for (i = 0; i < CONFIG_VBNV_SIZE; i++) + for (i = 0; i < VBNV_BLOCK_SIZE; i++) cmos_write(vbnv_copy[i], CONFIG_VBNV_OFFSET + 14 + i); } -- cgit v1.2.3