From 0d9068aa51eaa8f8229a933ba429dced4f641fc0 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 18 May 2017 15:08:51 -0700 Subject: [PATCH] UPSTREAM: drivers/spi/spi-generic: Make spi_setup_slave strong symbol Now that all platforms are updated to provide spi bus map, there is no need to keep the spi_setup_slave as a weak symbol. BUG=b:38430839 Change-Id: I9b4b8a600b5b6de3b2ec9956f24f09eaa4b2a321 Signed-off-by: Patrick Georgi Original-Commit-Id: dd8d24759d88cc5e3a82cdd471f15e1b079aa834 Original-Change-Id: I59b9bbb5303dad7ce062958a0ab8dee49a4ec1e0 Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://review.coreboot.org/19781 Original-Reviewed-by: Aaron Durbin Original-Tested-by: build bot (Jenkins) Reviewed-on: https://chromium-review.googlesource.com/514189 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/drivers/spi/spi-generic.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/drivers/spi/spi-generic.c b/src/drivers/spi/spi-generic.c index 579ceb1df7..31a6bc3155 100644 --- a/src/drivers/spi/spi-generic.c +++ b/src/drivers/spi/spi-generic.c @@ -112,11 +112,7 @@ void __attribute__((weak)) spi_init(void) /* Default weak implementation - do nothing. */ } -const struct spi_ctrlr_buses spi_ctrlr_bus_map[0] __attribute__((weak)); -const size_t spi_ctrlr_bus_map_count __attribute__((weak)); - -int __attribute__((weak)) spi_setup_slave(unsigned int bus, unsigned int cs, - struct spi_slave *slave) +int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) { size_t i;