Change in coreboot[master]: [WIP] CONFIG(CHROMEOS_VPD_MISC)

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50878 )

Change subject: [WIP] CONFIG(CHROMEOS_VPD_MISC)
......................................................................

[WIP] CONFIG(CHROMEOS_VPD_MISC)

Change-Id: I155dd4bfd78f9d062034c0a91608e012c97fbf2c
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/google/auron/variants/buddy/variant.c
M src/mainboard/google/beltino/lan.c
M src/mainboard/google/butterfly/mainboard.c
M src/mainboard/google/gale/mainboard.c
M src/mainboard/google/jecht/lan.c
M src/mainboard/google/mistral/mainboard.c
M src/mainboard/google/rambi/variants/ninja/lan.c
M src/mainboard/google/rambi/variants/sumo/lan.c
M src/mainboard/google/reef/variants/snappy/mainboard.c
M src/mainboard/google/smaug/mainboard.c
M src/mainboard/google/storm/mainboard.c
M src/vendorcode/google/chromeos/Kconfig
12 files changed, 16 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/50878/1

diff --git a/src/mainboard/google/auron/variants/buddy/variant.c b/src/mainboard/google/auron/variants/buddy/variant.c
index 2ffc38a..60dc57b 100644
--- a/src/mainboard/google/auron/variants/buddy/variant.c
+++ b/src/mainboard/google/auron/variants/buddy/variant.c
@@ -119,7 +119,7 @@
    u32 high_dword = 0xD0BA00A0;	/* high dword of mac address */
    u32 low_dword = 0x0000AD0B;	/* low word of mac address as a dword */

-	if (CONFIG(CHROMEOS)) {
+	if (CONFIG(CHROMEOS_VPD_MISC)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {
diff --git a/src/mainboard/google/beltino/lan.c b/src/mainboard/google/beltino/lan.c
index d9df5a1..63e2e11 100644
--- a/src/mainboard/google/beltino/lan.c
+++ b/src/mainboard/google/beltino/lan.c
@@ -100,7 +100,7 @@
    u32 high_dword = 0xD0BA00A0;	/* high dword of mac address */
    u32 low_dword = 0x0000AD0B;	/* low word of mac address as a dword */

-	if (CONFIG(CHROMEOS)) {
+	if (CONFIG(CHROMEOS_VPD_MISC)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index f278730..af4b05b 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -168,7 +168,7 @@
    struct device *ethernet_dev = NULL;
    void *vpd_file;

-	if (CONFIG(CHROMEOS)) {
+	if (CONFIG(CHROMEOS_VPD_MISC)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {
diff --git a/src/mainboard/google/gale/mainboard.c b/src/mainboard/google/gale/mainboard.c
index bc4fc93..de6343f 100644
--- a/src/mainboard/google/gale/mainboard.c
+++ b/src/mainboard/google/gale/mainboard.c
@@ -31,7 +31,7 @@
    setup_usb();

/* Copy WIFI calibration data into CBMEM. */
-	if (CONFIG(CHROMEOS))
+	if (CONFIG(CHROMEOS_VPD_MISC))
    	cbmem_add_vpd_calibration_data();

/*
@@ -63,7 +63,7 @@
    dma->range_start = (uintptr_t)_dma_coherent;
    dma->range_size = REGION_SIZE(dma_coherent);

-	if (CONFIG(CHROMEOS)) {
+	if (CONFIG(CHROMEOS_VPD_MISC)) {
    	/* Retrieve the switch interface MAC addresses. */
    	lb_table_add_macs_from_vpd(header);
    }
diff --git a/src/mainboard/google/jecht/lan.c b/src/mainboard/google/jecht/lan.c
index 4dedb56..8fa2290 100644
--- a/src/mainboard/google/jecht/lan.c
+++ b/src/mainboard/google/jecht/lan.c
@@ -100,7 +100,7 @@
    u32 high_dword = 0xD0BA00A0;	/* high dword of mac address */
    u32 low_dword = 0x0000AD0B;	/* low word of mac address as a dword */

-	if (CONFIG(CHROMEOS)) {
+	if (CONFIG(CHROMEOS_VPD_MISC)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {
diff --git a/src/mainboard/google/mistral/mainboard.c b/src/mainboard/google/mistral/mainboard.c
index 4079182..44b8dd9 100644
--- a/src/mainboard/google/mistral/mainboard.c
+++ b/src/mainboard/google/mistral/mainboard.c
@@ -20,7 +20,7 @@
 static void mainboard_init(struct device *dev)
 {
    /* Copy WIFI calibration data into CBMEM. */
-	if (CONFIG(CHROMEOS))
+	if (CONFIG(CHROMEOS_VPD_MISC))
    	cbmem_add_vpd_calibration_data();

setup_usb();
diff --git a/src/mainboard/google/rambi/variants/ninja/lan.c b/src/mainboard/google/rambi/variants/ninja/lan.c
index 1304071..f02f730 100644
--- a/src/mainboard/google/rambi/variants/ninja/lan.c
+++ b/src/mainboard/google/rambi/variants/ninja/lan.c
@@ -99,7 +99,7 @@
    u32 high_dword = 0xD0BA00A0;	/* high dword of mac address */
    u32 low_dword = 0x0000AD0B;	/* low word of mac address as a dword */

-	if (CONFIG(CHROMEOS)) {
+	if (CONFIG(CHROMEOS_VPD_MISC)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {
diff --git a/src/mainboard/google/rambi/variants/sumo/lan.c b/src/mainboard/google/rambi/variants/sumo/lan.c
index 29bc0fe..f027c60 100644
--- a/src/mainboard/google/rambi/variants/sumo/lan.c
+++ b/src/mainboard/google/rambi/variants/sumo/lan.c
@@ -99,7 +99,7 @@
    u32 high_dword = 0xD0BA00A0;	/* high dword of mac address */
    u32 low_dword = 0x0000AD0B;	/* low word of mac address as a dword */

-	if (CONFIG(CHROMEOS)) {
+	if (CONFIG(CHROMEOS_VPD_MISC)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {
diff --git a/src/mainboard/google/reef/variants/snappy/mainboard.c b/src/mainboard/google/reef/variants/snappy/mainboard.c
index fc0652c..f6489cb 100644
--- a/src/mainboard/google/reef/variants/snappy/mainboard.c
+++ b/src/mainboard/google/reef/variants/snappy/mainboard.c
@@ -43,7 +43,7 @@

board_sku_num = sku_strapping_value();

-	if (!CONFIG(CHROMEOS))
+	if (!CONFIG(CHROMEOS_VPD_MISC))
    	return board_sku_num;

if (!vpd_gets(vpd_skuid, vpd_buffer, ARRAY_SIZE(vpd_buffer), VPD_RO_THEN_RW))
diff --git a/src/mainboard/google/smaug/mainboard.c b/src/mainboard/google/smaug/mainboard.c
index 852e73d..5a543ba 100644
--- a/src/mainboard/google/smaug/mainboard.c
+++ b/src/mainboard/google/smaug/mainboard.c
@@ -203,7 +203,7 @@

void lb_board(struct lb_header *header)
 {
-	if (CONFIG(CHROMEOS))
+	if (CONFIG(CHROMEOS_VPD_MISC))
    	lb_table_add_serialno_from_vpd(header);

soc_add_mtc(header);
diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 4faf832..0c972af 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -77,7 +77,7 @@
     board_nand_init();

/* Copy WIFI calibration data into CBMEM. */
-	if (CONFIG(CHROMEOS))
+	if (CONFIG(CHROMEOS_VPD_MISC))
    	cbmem_add_vpd_calibration_data();

/*
@@ -110,6 +110,6 @@
    dma->range_size = REGION_SIZE(dma_coherent);

/* Retrieve the switch interface MAC addresses. */
-	if (CONFIG(CHROMEOS))
+	if (CONFIG(CHROMEOS_VPD_MISC))
    	lb_table_add_macs_from_vpd(header);
 }
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index e6d45e1..39f198c 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -92,5 +92,8 @@
    bool
    depends on ACPI_SOC_NVS

+config CHROMEOS_VPD_MISC
+	def_bool y
+
 endif # CHROMEOS
 endmenu