diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-11-04 06:36:25 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-11-06 10:46:01 +0000 |
| commit | 381860454fb5a1a6ffc4c8d1fdf3f021f75cbcbc (patch) | |
| tree | 3f4a7ebdcc969700ae5c3818da8219f8e476f003 | |
| parent | 402b69ea58e9440eedc860d33f925fd0c1bb4c56 (diff) | |
| download | coreboot-381860454fb5a1a6ffc4c8d1fdf3f021f75cbcbc.tar.gz coreboot-381860454fb5a1a6ffc4c8d1fdf3f021f75cbcbc.tar.bz2 coreboot-381860454fb5a1a6ffc4c8d1fdf3f021f75cbcbc.zip | |
google/guybrush: Move SPI speed override
SPI speed override is not related to ChromeOS, thus the
location in chromeos.c was poor choice.
Change-Id: Ie3db89f252af1f44e9539497c05bdf965565a191
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58945
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
| -rw-r--r-- | src/mainboard/google/guybrush/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/google/guybrush/chromeos.c | 10 | ||||
| -rw-r--r-- | src/mainboard/google/guybrush/spi_speeds.c | 13 |
3 files changed, 15 insertions, 10 deletions
diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc index 6bc328827675..fa729feccf04 100644 --- a/src/mainboard/google/guybrush/Makefile.inc +++ b/src/mainboard/google/guybrush/Makefile.inc @@ -18,6 +18,8 @@ ramstage-y += mainboard.c ramstage-y += ec.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c +all-y += spi_speeds.c + verstage-y += verstage.c verstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/google/guybrush/chromeos.c b/src/mainboard/google/guybrush/chromeos.c index 6cd48ea440a7..61313223fead 100644 --- a/src/mainboard/google/guybrush/chromeos.c +++ b/src/mainboard/google/guybrush/chromeos.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include <amdblocks/spi.h> #include <baseboard/gpio.h> -#include <boardid.h> #include <bootmode.h> #include <boot/coreboot_tables.h> #include <gpio.h> @@ -27,11 +25,3 @@ void mainboard_chromeos_acpi_generate(void) { chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios)); } - -void mainboard_spi_fast_speed_override(uint8_t *fast_speed) -{ - uint32_t board_ver = board_id(); - - if (board_ver >= CONFIG_OVERRIDE_EFS_SPI_SPEED_MIN_BOARD) - *fast_speed = CONFIG_OVERRIDE_EFS_SPI_SPEED; -} diff --git a/src/mainboard/google/guybrush/spi_speeds.c b/src/mainboard/google/guybrush/spi_speeds.c new file mode 100644 index 000000000000..857e02d90080 --- /dev/null +++ b/src/mainboard/google/guybrush/spi_speeds.c @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <amdblocks/spi.h> +#include <boardid.h> +#include <stdint.h> + +void mainboard_spi_fast_speed_override(uint8_t *fast_speed) +{ + uint32_t board_ver = board_id(); + + if (board_ver >= CONFIG_OVERRIDE_EFS_SPI_SPEED_MIN_BOARD) + *fast_speed = CONFIG_OVERRIDE_EFS_SPI_SPEED; +} |