summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c3
-rw-r--r--src/mainboard/google/zork/variants/dalboz/Makefile.inc2
-rw-r--r--src/mainboard/google/zork/variants/dalboz/romstage.c25
3 files changed, 3 insertions, 27 deletions
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 5874e89c06..c2438768c8 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -268,6 +268,9 @@ __weak void variant_pcie_power_reset_configure(void)
{
uint32_t board_version;
+ /* Deassert PCIE_RST1_L */
+ gpio_set(GPIO_27, 1);
+
if (!google_chromeec_cbi_get_board_version(&board_version) &&
(board_version >= CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS))
wifi_power_reset_configure_v3();
diff --git a/src/mainboard/google/zork/variants/dalboz/Makefile.inc b/src/mainboard/google/zork/variants/dalboz/Makefile.inc
index a616e2fdc0..51d19fe9ba 100644
--- a/src/mainboard/google/zork/variants/dalboz/Makefile.inc
+++ b/src/mainboard/google/zork/variants/dalboz/Makefile.inc
@@ -2,7 +2,5 @@
subdirs-y += ./spd
-romstage-y += romstage.c
-
ramstage-y += gpio.c
ramstage-y += variant.c
diff --git a/src/mainboard/google/zork/variants/dalboz/romstage.c b/src/mainboard/google/zork/variants/dalboz/romstage.c
deleted file mode 100644
index 42e36c4525..0000000000
--- a/src/mainboard/google/zork/variants/dalboz/romstage.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <stddef.h>
-#include <soc/romstage.h>
-#include <baseboard/variants.h>
-#include <ec/google/chromeec/ec.h>
-#include <gpio.h>
-#include <soc/gpio.h>
-#include <variant/gpio.h>
-
-void variant_romstage_entry(void)
-{
- uint32_t board_version;
-
- if (google_chromeec_cbi_get_board_version(&board_version))
- board_version = 1;
-
- if (board_version < 2) {
- /* SET PCIE_RST0_L HIGH */
- gpio_set(WIFI_PCIE_RESET_L, 1);
- } else {
- /* SET PCIE_RST1_L HIGH */
- gpio_set(PCIE_RST1_L, 1);
- }
-}