From 99416035fac228f138f3e291a47173b66954b452 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 14 Sep 2018 21:19:29 -0500 Subject: google/auron: Clean up variant-specific romstage code Use an empty weak function for variant_romstage_entry(), rather than having separate empty functions for boards which don't utilize it. Change-Id: I7a278ed716484bea377a5dd98d4a534502c8bab6 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/28612 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/google/auron/romstage.c | 6 +++++- src/mainboard/google/auron/variants/auron_paine/variant.c | 6 ------ src/mainboard/google/auron/variants/auron_yuna/variant.c | 6 ------ 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c index aedc33d3ed..aea8e211fa 100644 --- a/src/mainboard/google/auron/romstage.c +++ b/src/mainboard/google/auron/romstage.c @@ -25,6 +25,10 @@ #include #include "variant.h" +__weak void variant_romstage_entry(struct romstage_params *rp) +{ +} + void mainboard_romstage_entry(struct romstage_params *rp) { struct pei_data pei_data; @@ -43,6 +47,6 @@ void mainboard_romstage_entry(struct romstage_params *rp) /* Call into the real romstage main with this board's attributes. */ romstage_common(rp); - /* Do variant-specific (read: Samus) init */ + /* Do variant-specific init */ variant_romstage_entry(rp); } diff --git a/src/mainboard/google/auron/variants/auron_paine/variant.c b/src/mainboard/google/auron/variants/auron_paine/variant.c index f1af14d53c..b924976d06 100644 --- a/src/mainboard/google/auron/variants/auron_paine/variant.c +++ b/src/mainboard/google/auron/variants/auron_paine/variant.c @@ -12,7 +12,6 @@ */ #include -#include #include #include @@ -32,8 +31,3 @@ int variant_smbios_data(device_t dev, int *handle, return len; } - -void variant_romstage_entry(struct romstage_params *rp) -{ - /* N/A for boards other than SAMUS */ -} diff --git a/src/mainboard/google/auron/variants/auron_yuna/variant.c b/src/mainboard/google/auron/variants/auron_yuna/variant.c index f1af14d53c..b924976d06 100644 --- a/src/mainboard/google/auron/variants/auron_yuna/variant.c +++ b/src/mainboard/google/auron/variants/auron_yuna/variant.c @@ -12,7 +12,6 @@ */ #include -#include #include #include @@ -32,8 +31,3 @@ int variant_smbios_data(device_t dev, int *handle, return len; } - -void variant_romstage_entry(struct romstage_params *rp) -{ - /* N/A for boards other than SAMUS */ -} -- cgit v1.2.3