sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52517
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Matt DeVillier 2021-04-19 13:14:24 -05:00 committed by Patrick Georgi
parent 82c9b703ea
commit d1b3f241b1
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/google/auron/variants/buddy/variant.c
View File

@ -119,7 +119,7 @@ static void program_mac_address(u16 io_base)
u32 high_dword = 0xD0BA00A0; /* high dword of mac address */ u32 high_dword = 0xD0BA00A0; /* high dword of mac address */
u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */ u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */
if (CONFIG(CHROMEOS)) { if (CONFIG(VPD)) {
struct region_device rdev; struct region_device rdev;
if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) { if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {

2
src/mainboard/google/beltino/lan.c
View File

@ -100,7 +100,7 @@ static void program_mac_address(u16 io_base)
u32 high_dword = 0xD0BA00A0; /* high dword of mac address */ u32 high_dword = 0xD0BA00A0; /* high dword of mac address */
u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */ u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */
if (CONFIG(CHROMEOS)) { if (CONFIG(VPD)) {
struct region_device rdev; struct region_device rdev;
if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) { if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {

2
src/mainboard/google/butterfly/mainboard.c
View File

@ -168,7 +168,7 @@ static void mainboard_init(struct device *dev)
struct device *ethernet_dev = NULL; struct device *ethernet_dev = NULL;
void *vpd_file; void *vpd_file;
if (CONFIG(CHROMEOS)) { if (CONFIG(VPD)) {
struct region_device rdev; struct region_device rdev;
if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) { if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {

2
src/mainboard/google/jecht/lan.c
View File

@ -100,7 +100,7 @@ static void program_mac_address(u16 io_base)
u32 high_dword = 0xD0BA00A0; /* high dword of mac address */ u32 high_dword = 0xD0BA00A0; /* high dword of mac address */
u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */ u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */
if (CONFIG(CHROMEOS)) { if (CONFIG(VPD)) {
struct region_device rdev; struct region_device rdev;
if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) { if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {

2
src/mainboard/google/rambi/variants/ninja/lan.c
View File

@ -99,7 +99,7 @@ static void program_mac_address(u16 io_base)
u32 high_dword = 0xD0BA00A0; /* high dword of mac address */ u32 high_dword = 0xD0BA00A0; /* high dword of mac address */
u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */ u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */
if (CONFIG(CHROMEOS)) { if (CONFIG(VPD)) {
struct region_device rdev; struct region_device rdev;
if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) { if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {

2
src/mainboard/google/rambi/variants/sumo/lan.c
View File

@ -99,7 +99,7 @@ static void program_mac_address(u16 io_base)
u32 high_dword = 0xD0BA00A0; /* high dword of mac address */ u32 high_dword = 0xD0BA00A0; /* high dword of mac address */
u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */ u32 low_dword = 0x0000AD0B; /* low word of mac address as a dword */
if (CONFIG(CHROMEOS)) { if (CONFIG(VPD)) {
struct region_device rdev; struct region_device rdev;
if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) { if (fmap_locate_area_as_rdev("RO_VPD", &rdev) == 0) {