From c9f124a8fbe3b01ebf7619957e459f543de87536 Mon Sep 17 00:00:00 2001 From: Ana Carolina Cabral Date: Thu, 24 Apr 2025 11:12:49 -0300 Subject: [PATCH] mb/amd/crater/ec: Make macro ENABLE_M2_SSD1 a Kconfig option Move the option to enable M.2 SDD slot to Kconfig file instead of using a macro. Its already used like a Kconfig option later on, so the if condition actually works now. Change-Id: I104eae5501da6ed1fe43039f88d6722c1e54e82d Signed-off-by: Ana Carolina Cabral Signed-off-by: Maximilian Brune Reviewed-on: https://review.coreboot.org/c/coreboot/+/87443 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/amd/crater/Kconfig | 6 ++++++ src/mainboard/amd/crater/ec.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mainboard/amd/crater/Kconfig b/src/mainboard/amd/crater/Kconfig index cc15d467ab..729e1d6fd8 100644 --- a/src/mainboard/amd/crater/Kconfig +++ b/src/mainboard/amd/crater/Kconfig @@ -92,6 +92,12 @@ config ENABLE_EVAL_19V help Enable the 19V rail for Eval Card PCIe slot +config ENABLE_M2_SSD + bool "Enable M.2 SSD Slot" + default y + help + Use GPP[8:11] connected to M.2 SSD + choice prompt "XGBE/WWAN/WLAN/DT Selection" default XGBE_WWAN_WLAN diff --git a/src/mainboard/amd/crater/ec.c b/src/mainboard/amd/crater/ec.c index b97b1100c4..442782e1d4 100644 --- a/src/mainboard/amd/crater/ec.c +++ b/src/mainboard/amd/crater/ec.c @@ -9,7 +9,6 @@ #define CRATER_EC_CMD 0x666 #define CRATER_EC_DATA 0x662 -#define ENABLE_M2_SSD1 1 #define EC_GPIO_0_ADDR 0xA0 #define EC_EVAL_PWREN BIT(0) @@ -144,7 +143,7 @@ static void configure_ec_gpio(void) ec_write(EC_GPIO_4_ADDR, tmp); tmp = ec_read(EC_GPIO_7_ADDR); - if (CONFIG(ENABLE_M2_SSD1)) { + if (CONFIG(ENABLE_M2_SSD)) { tmp |= (EC7_ODD_SSD_SW | EC7_SSD_HDD_SW); } else { tmp &= ~(EC7_ODD_SSD_SW | EC7_SSD_HDD_SW); @@ -162,7 +161,7 @@ static void configure_ec_gpio(void) ec_write(EC_GPIO_7_ADDR, tmp); tmp = ec_read(EC_GPIO_8_ADDR); - if (CONFIG(ENABLE_M2_SSD1)) { + if (CONFIG(ENABLE_M2_SSD)) { tmp |= EC8_M2SSD_PWREN; } else { tmp &= ~EC8_M2SSD_PWREN;