diff options
| author | Keith Short <keithshort@chromium.org> | 2022-07-21 13:32:06 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-01 16:21:47 +0000 |
| commit | b719d38f1a02fbe3f003b5f2b840166496b3326c (patch) | |
| tree | ad2fbe58f9118eba4c17948fea57386c8c35b6a5 /zephyr/shim/include | |
| parent | 094eddd5e0b92d63c79d6e357f2d1e61c5009553 (diff) | |
| download | chrome-ec-b719d38f1a02fbe3f003b5f2b840166496b3326c.tar.gz | |
zephyr: Delete CONFIG_PLATFORM_EC_ADC
CONFIG_PLATFORM_EC_ADC is redundant with the Zephyr Kconfig option,
CONFIG_ADC. Use the Zephyr option directly.
Note - projects based on the "minimal" config do not compare. The
minimal config disabled CONFIG_ADC, but the CONFIG_PLATFORM_EC_ADC_CMD
was still enabled. With this CL, CONFIG_PLATFORM_EC_ADC_CMD now depends
on CONFIG_ADC.
BUG=none
BRANCH=none
TEST=zmake testall --static; compare binaries
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I129a3f490abd5c8234bc06ed6f86f2d7ff8a13b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3791659
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'zephyr/shim/include')
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 5 | ||||
| -rw-r--r-- | zephyr/shim/include/zephyr_adc.h | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index b61c7dd259..10281f4b91 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -565,11 +565,6 @@ extern struct jump_data mock_jump_data; #define CONFIG_FLASH_SIZE_BYTES CONFIG_PLATFORM_EC_FLASH_SIZE_BYTES #endif /* CONFIG_PLATFORM_EC_FLASH_SIZE_BYTES */ -#undef CONFIG_ADC -#ifdef CONFIG_PLATFORM_EC_ADC -#define CONFIG_ADC -#endif - #undef CONFIG_ADC_CHANNELS_RUNTIME_CONFIG #ifdef CONFIG_PLATFORM_EC_ADC_CHANNELS_RUNTIME_CONFIG #define CONFIG_ADC_CHANNELS_RUNTIME_CONFIG diff --git a/zephyr/shim/include/zephyr_adc.h b/zephyr/shim/include/zephyr_adc.h index 5ceca5725e..8f9b1f85d5 100644 --- a/zephyr/shim/include/zephyr_adc.h +++ b/zephyr/shim/include/zephyr_adc.h @@ -8,7 +8,7 @@ #include <zephyr/drivers/adc.h> -#ifdef CONFIG_PLATFORM_EC_ADC +#ifdef CONFIG_ADC #define ZSHIM_ADC_ID(node_id) DT_STRING_UPPER_TOKEN(node_id, enum_name) #define ADC_ID_WITH_COMMA(node_id) ZSHIM_ADC_ID(node_id), @@ -39,6 +39,6 @@ extern struct adc_t adc_channels[]; #else /* Empty declaration to avoid warnings if adc.h is included */ enum adc_channel { ADC_CH_COUNT }; -#endif /* CONFIG_PLATFORM_EC_ADC */ +#endif /* CONFIG_ADC */ #endif /* __CROS_EC_ZEPHYR_ADC_H */ |