Aamir Bohra has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46234 )
Change subject: mb/google/volteer: Source Memory strap GPIOs from variant ......................................................................
mb/google/volteer: Source Memory strap GPIOs from variant
Allow memory strap GPIOs to be sourced from variant gpio.h. This is done to fix compilation issue of macro redefinition when one of the variant uses a different set of memory strap GPIOs.
Change-Id: I5c1ebfb39b2a56ca94a92941e8beed1acc28e655 Signed-off-by: Aamir Bohra aamir.bohra@intel.com --- M src/mainboard/google/volteer/variants/baseboard/include/baseboard/gpio.h M src/mainboard/google/volteer/variants/baseboard/memory.c 2 files changed, 1 insertion(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/46234/1
diff --git a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/gpio.h index 4e2733e..26308cf1 100644 --- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/gpio.h @@ -12,12 +12,6 @@ /* BIOS Flash Write Protect */ #define GPIO_PCH_WP GPP_B11
-/* Memory configuration board straps */ -#define GPIO_MEM_CONFIG_0 GPP_C12 -#define GPIO_MEM_CONFIG_1 GPP_C15 -#define GPIO_MEM_CONFIG_2 GPP_C14 -#define GPIO_MEM_CONFIG_3 GPP_D15 - /* EC wake is LAN_WAKE# */ #define GPE_EC_WAKE GPE0_LAN_WAK
diff --git a/src/mainboard/google/volteer/variants/baseboard/memory.c b/src/mainboard/google/volteer/variants/baseboard/memory.c index dafeb3b..d5a99a9 100644 --- a/src/mainboard/google/volteer/variants/baseboard/memory.c +++ b/src/mainboard/google/volteer/variants/baseboard/memory.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <baseboard/gpio.h> +#include <variant/gpio.h> #include <baseboard/variants.h> #include <gpio.h>