Change in coreboot[master]: mb/google/*: allow LAN MAC to be read from VPD w/o ChromeOS

[Patrick Georgi (Code Review)]

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

Change subject: mb/google/*: allow LAN MAC to be read from VPD w/o ChromeOS
......................................................................

mb/google/*: allow LAN MAC to be read from VPD w/o ChromeOS

Condition use of RO_VPD for LAN MAC address on CONFIG_VPD rather
than CONFIG_CHROMEOS.

Test: build/boot google/{beltino,jecht} with RO_VPD propagated from
stock firmware, verify MAC address set correctly.

Change-Id: I1606fe1936ccee6e03dee145901767c8e73bfe2d
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52517
Reviewed-by: Angel Pons 
Reviewed-by: Paul Menzel 
Tested-by: build bot (Jenkins) 
---
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/jecht/lan.c
M src/mainboard/google/rambi/variants/ninja/lan.c
M src/mainboard/google/rambi/variants/sumo/lan.c
6 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/google/auron/variants/buddy/variant.c b/src/mainboard/google/auron/variants/buddy/variant.c
index 2ffc38a..397b541 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(VPD)) {
    	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..1104ea7 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(VPD)) {
    	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 d9cf1b9..6759b86 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(VPD)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {
diff --git a/src/mainboard/google/jecht/lan.c b/src/mainboard/google/jecht/lan.c
index 4dedb56..a431393 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(VPD)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {
diff --git a/src/mainboard/google/rambi/variants/ninja/lan.c b/src/mainboard/google/rambi/variants/ninja/lan.c
index 1304071..0abbffe 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(VPD)) {
    	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..66083ae 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(VPD)) {
    	struct region_device rdev;

if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {