From 8327de8e2e74a0b9e0fb1fddb23d7a6e0eb2e4ec Mon Sep 17 00:00:00 2001 From: CTCaer Date: Thu, 20 Jan 2022 13:19:48 +0200 Subject: [PATCH] bdk: replace NYX flag with proper flags - BDK_MINERVA_CFG_FROM_RAM: enables support for getting minerva configuration from nyx storage - BDK_HW_EXTRA_DEINIT: enables extra deinit in hw_reinit_workaround - BDK_SDMMC_OC_AND_EXTRA_PRINT: enables eMMC OC support (533 MB/s) and extra error printing --- bdk/mem/minerva.c | 2 +- bdk/soc/hw_init.c | 2 +- bdk/storage/sdmmc_driver.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bdk/mem/minerva.c b/bdk/mem/minerva.c index 643e2e2..301eced 100644 --- a/bdk/mem/minerva.c +++ b/bdk/mem/minerva.c @@ -42,7 +42,7 @@ u32 minerva_init() if (hw_get_chip_id() == GP_HIDREV_MAJOR_T210B01) return 0; -#ifdef NYX +#ifdef BDK_MINERVA_CFG_FROM_RAM // Set table to nyx storage. mtc_cfg->mtc_table = (emc_table_t *)nyx_str->mtc_table; diff --git a/bdk/soc/hw_init.c b/bdk/soc/hw_init.c index 9bb80f5..c57b653 100644 --- a/bdk/soc/hw_init.c +++ b/bdk/soc/hw_init.c @@ -418,7 +418,7 @@ void hw_reinit_workaround(bool coreboot, u32 bl_magic) // Disable BPMP max clock. bpmp_clk_rate_set(BPMP_CLK_NORMAL); -#ifdef NYX +#ifdef BDK_HW_EXTRA_DEINIT // Disable temperature sensor, touchscreen, 5V regulators and Joy-Con. tmp451_end(); set_fan_duty(0); diff --git a/bdk/storage/sdmmc_driver.c b/bdk/storage/sdmmc_driver.c index c13d12b..f31271e 100644 --- a/bdk/storage/sdmmc_driver.c +++ b/bdk/storage/sdmmc_driver.c @@ -34,7 +34,7 @@ //#define ERROR_EXTRA_PRINTING #define DPRINTF(...) -#ifdef NYX +#ifdef BDK_SDMMC_OC_AND_EXTRA_PRINT #define ERROR_EXTRA_PRINTING #define SDMMC_EMMC_OC #endif