From 368598198d5c741d64b38d358e84c1694f97f486 Mon Sep 17 00:00:00 2001 From: Aamir Bohra Date: Tue, 18 Dec 2018 15:46:28 +0530 Subject: mb/google/hatch: Clean up gpio definitions in hatch variant This implementation cleans up gpio configuration functions and limit definition to baseboard only for now, until variant specfic overides are needed. BUG=b:120914069 TEST=USE="-intel_mrc -bmpblk" emerge-hatch coreboot Change-Id: I563f6b97812b32d6e3d99e3df512dc112da78aea Signed-off-by: Aamir Bohra Reviewed-on: https://review.coreboot.org/c/30291 Reviewed-by: Furquan Shaikh Reviewed-by: Subrata Banik Tested-by: build bot (Jenkins) --- src/mainboard/google/hatch/ramstage.c | 2 +- .../google/hatch/variants/baseboard/gpio.c | 11 ++----- .../baseboard/include/baseboard/variants.h | 8 +---- .../google/hatch/variants/hatch/Makefile.inc | 17 ---------- src/mainboard/google/hatch/variants/hatch/gpio.c | 38 ---------------------- 5 files changed, 4 insertions(+), 72 deletions(-) delete mode 100644 src/mainboard/google/hatch/variants/hatch/Makefile.inc delete mode 100644 src/mainboard/google/hatch/variants/hatch/gpio.c (limited to 'src/mainboard/google/hatch') diff --git a/src/mainboard/google/hatch/ramstage.c b/src/mainboard/google/hatch/ramstage.c index 1ac6a296cd..d139effef2 100644 --- a/src/mainboard/google/hatch/ramstage.c +++ b/src/mainboard/google/hatch/ramstage.c @@ -24,7 +24,7 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *params) const struct pad_config *gpio_table; size_t num_gpios; - gpio_table = variant_base_gpio_table(&num_gpios); + gpio_table = variant_gpio_table(&num_gpios); gpio_configure_pads(gpio_table, num_gpios); } diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c index d2efd488e2..6f6b9d2877 100644 --- a/src/mainboard/google/hatch/variants/baseboard/gpio.c +++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c @@ -21,24 +21,17 @@ static const struct pad_config gpio_table[] = { }; -const struct pad_config *__weak variant_base_gpio_table(size_t *num) +const struct pad_config *__weak variant_gpio_table(size_t *num) { *num = ARRAY_SIZE(gpio_table); return gpio_table; } -const struct pad_config *__weak variant_override_gpio_table(size_t *num) -{ - *num = 0; - return NULL; -} - /* GPIOs needed prior to ramstage. */ static const struct pad_config early_gpio_table[] = { }; -const struct pad_config *__weak -variant_early_gpio_table(size_t *num) +const struct pad_config *__weak variant_early_gpio_table(size_t *num) { *num = ARRAY_SIZE(early_gpio_table); return early_gpio_table; diff --git a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h index 18f90488ad..90a52c0c2f 100644 --- a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h @@ -22,10 +22,8 @@ /* The next set of functions return the gpio table and fill in the number of * entries for each table. */ -const struct pad_config *variant_base_gpio_table(size_t *num); -const struct pad_config *variant_override_gpio_table(size_t *num); +const struct pad_config *variant_gpio_table(size_t *num); const struct pad_config *variant_early_gpio_table(size_t *num); -const struct pad_config *variant_sleep_gpio_table(size_t *num, int slp_typ); /* Return memory SKU for the board. */ size_t variant_memory_sku(void); @@ -33,8 +31,4 @@ size_t variant_memory_sku(void); /* Return ChromeOS gpio table and fill in number of entries. */ const struct cros_gpio *variant_cros_gpios(size_t *num); -/* Modify devictree settings during ramstage. */ -struct device; -void variant_update_devtree(struct device *dev); - #endif /* BASEBOARD_VARIANTS_H */ diff --git a/src/mainboard/google/hatch/variants/hatch/Makefile.inc b/src/mainboard/google/hatch/variants/hatch/Makefile.inc deleted file mode 100644 index d4d85374cc..0000000000 --- a/src/mainboard/google/hatch/variants/hatch/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright 2018 Google LLC -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -bootblock-y += gpio.c -ramstage-y += gpio.c diff --git a/src/mainboard/google/hatch/variants/hatch/gpio.c b/src/mainboard/google/hatch/variants/hatch/gpio.c deleted file mode 100644 index 24535f5319..0000000000 --- a/src/mainboard/google/hatch/variants/hatch/gpio.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2018 Google LLC - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the - * GNU General Public License for more details. - */ - -#include -#include -#include - -/* Pad configuration in ramstage */ -static const struct pad_config gpio_table[] = { -}; - -/* Early pad configuration in bootblock */ -static const struct pad_config early_gpio_table[] = { -}; - -const struct pad_config *variant_base_gpio_table(size_t *num) -{ - *num = ARRAY_SIZE(gpio_table); - return gpio_table; -} - -const struct pad_config *variant_early_gpio_table(size_t *num) -{ - *num = ARRAY_SIZE(early_gpio_table); - return early_gpio_table; -} -- cgit v1.2.3