[coreboot-gerrit] Change in coreboot[master]: drivers/vpd: rename VPD_ANY to VPD_RO_THEN_RW

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41586 )

Change subject: drivers/vpd: rename VPD_ANY to VPD_RO_THEN_RW
......................................................................

drivers/vpd: rename VPD_ANY to VPD_RO_THEN_RW

Rename VPD_ANY to VPD_RO_THEN_RW, to reflect the VPD region search
preference. Update all existing code references for VPD_ANY.

Signed-off-by: Jonathan Zhang 
Change-Id: I960688d1f6ab199768107ab73b8a7400a3fdf473
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41586
Reviewed-by: Julius Werner 
Tested-by: build bot (Jenkins) 
---
M src/drivers/vpd/vpd.h
M src/mainboard/google/reef/variants/snappy/mainboard.c
M src/vendorcode/google/chromeos/sar.c
M src/vendorcode/google/chromeos/vpd_calibration.c
M src/vendorcode/google/chromeos/vpd_mac.c
M src/vendorcode/google/chromeos/vpd_serialno.c
M src/vendorcode/google/chromeos/wrdd.c
7 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved

diff --git a/src/drivers/vpd/vpd.h b/src/drivers/vpd/vpd.h
index d54cef8..df7711a 100644
--- a/src/drivers/vpd/vpd.h
+++ b/src/drivers/vpd/vpd.h
@@ -8,7 +8,7 @@
 #define GOOGLE_VPD_2_0_OFFSET 0x600

enum vpd_region {
-	VPD_ANY = 0,
+	VPD_RO_THEN_RW = 0,
    VPD_RO = 1,
    VPD_RW = 2
 };
diff --git a/src/mainboard/google/reef/variants/snappy/mainboard.c b/src/mainboard/google/reef/variants/snappy/mainboard.c
index 0dd7529..fc0652c 100644
--- a/src/mainboard/google/reef/variants/snappy/mainboard.c
+++ b/src/mainboard/google/reef/variants/snappy/mainboard.c
@@ -46,7 +46,7 @@
    if (!CONFIG(CHROMEOS))
    	return board_sku_num;

-	if (!vpd_gets(vpd_skuid, vpd_buffer, ARRAY_SIZE(vpd_buffer), VPD_ANY))
+	if (!vpd_gets(vpd_skuid, vpd_buffer, ARRAY_SIZE(vpd_buffer), VPD_RO_THEN_RW))
    	return board_sku_num;

vpd_len = strlen(vpd_buffer);
diff --git a/src/vendorcode/google/chromeos/sar.c b/src/vendorcode/google/chromeos/sar.c
index ab4f3d2..b07d41d 100644
--- a/src/vendorcode/google/chromeos/sar.c
+++ b/src/vendorcode/google/chromeos/sar.c
@@ -70,7 +70,7 @@

/* Try to read the SAR limit entry from VPD */
    if (!vpd_gets(wifi_sar_limit_key, wifi_sar_limit_str,
-							 buffer_size, VPD_ANY)) {
+							 buffer_size, VPD_RO_THEN_RW)) {
    	printk(BIOS_ERR, "Error: Could not locate '%s' in VPD.\n",
    			wifi_sar_limit_key);

diff --git a/src/vendorcode/google/chromeos/vpd_calibration.c b/src/vendorcode/google/chromeos/vpd_calibration.c
index 3dc58d1..ab862c8 100644
--- a/src/vendorcode/google/chromeos/vpd_calibration.c
+++ b/src/vendorcode/google/chromeos/vpd_calibration.c
@@ -99,7 +99,7 @@
    		strcpy(cache->key_name, templates[i]);
    		cache->key_name[index_location] = j + '0';

-			payload = vpd_find(cache->key_name, &payload_size, VPD_ANY);
+			payload = vpd_find(cache->key_name, &payload_size, VPD_RO_THEN_RW);
    		if (!payload)
    			continue;

diff --git a/src/vendorcode/google/chromeos/vpd_mac.c b/src/vendorcode/google/chromeos/vpd_mac.c
index 097afcb..385b9f4 100644
--- a/src/vendorcode/google/chromeos/vpd_mac.c
+++ b/src/vendorcode/google/chromeos/vpd_mac.c
@@ -73,7 +73,7 @@
    		 * in the VPD - move on.
    		 */
    		if (!vpd_gets(mac_addr_key, mac_addr_str,
-					   sizeof(mac_addr_str), VPD_ANY))
+					   sizeof(mac_addr_str), VPD_RO_THEN_RW))
    			break;

if (!macs) {
diff --git a/src/vendorcode/google/chromeos/vpd_serialno.c b/src/vendorcode/google/chromeos/vpd_serialno.c
index 9ee4f6f..9a3aa81 100644
--- a/src/vendorcode/google/chromeos/vpd_serialno.c
+++ b/src/vendorcode/google/chromeos/vpd_serialno.c
@@ -15,7 +15,7 @@
    size_t len;

if (!vpd_gets(serialno_key, serialno,
-				sizeof(serialno), VPD_ANY)) {
+				sizeof(serialno), VPD_RO_THEN_RW)) {
    	printk(BIOS_ERR, "no serial number in vpd\n");
    	return;
    }
diff --git a/src/vendorcode/google/chromeos/wrdd.c b/src/vendorcode/google/chromeos/wrdd.c
index e9d7247..524a7e0 100644
--- a/src/vendorcode/google/chromeos/wrdd.c
+++ b/src/vendorcode/google/chromeos/wrdd.c
@@ -48,7 +48,7 @@

/* If not found for any reason fall backto the default value */
    if (!vpd_gets(wrdd_domain_key, wrdd_domain_code,
-		ARRAY_SIZE(wrdd_domain_code), VPD_ANY)) {
+		ARRAY_SIZE(wrdd_domain_code), VPD_RO_THEN_RW)) {
    	printk(BIOS_DEBUG,
    	"Error: Could not locate '%s' in VPD\n", wrdd_domain_key);
    	return WRDD_DEFAULT_REGULATORY_DOMAIN;