diff options
author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-12-13 15:17:56 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-15 09:26:22 +0000 |
commit | 613e64ed985025f332e781a796ea8ca86c8e77a1 (patch) | |
tree | 657ccf98e1dfa4403c34698d398f16b4a25e0bd7 | |
parent | 3f560db8974b16907b4a3fb3755d98f75276ff67 (diff) | |
download | chrome-ec-613e64ed985025f332e781a796ea8ca86c8e77a1.tar.gz |
zephyr: config: drop a bunch of automatic options
Drop a bunch of options that are already automatically selected based on
the devicetree nodes. Found these hacking this snippet in kconfig.py:
```
f = open("/tmp/options", "w")
for name, val in kconf.syms.items():
dep = expr_str(val.direct_dep)
if "DT_HAS_" in dep:
print(name)
f.write(name + "\n")
f.close()
```
and
```
for x in $( cat /tmp/options ); do git grep CONFIG_$x=y; done
```
Should make it a presubmit check eventually.
BRANCH=none
BUG=none
TEST=zmake compare-builds -a
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I9005a3cef2073073b88d47192c7b30ccab6c9e58
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4100865
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
-rw-r--r-- | zephyr/boards/arm/mec1727/mec1727_defconfig | 3 | ||||
-rw-r--r-- | zephyr/boards/arm/npcx7/npcx7_defconfig | 2 | ||||
-rw-r--r-- | zephyr/boards/arm/npcx9/npcx9m3f_defconfig | 2 | ||||
-rw-r--r-- | zephyr/boards/arm/npcx9/npcx9m7f_defconfig | 2 | ||||
-rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig | 2 | ||||
-rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig | 2 | ||||
-rw-r--r-- | zephyr/program/geralt/program.conf | 3 | ||||
-rw-r--r-- | zephyr/program/herobrine/evoker/project.conf | 2 | ||||
-rw-r--r-- | zephyr/program/intelrvp/adlrvp/adlrvp_mchp/prj.conf | 1 | ||||
-rw-r--r-- | zephyr/program/intelrvp/mtlrvp/mtlrvpp_mchp/prj.conf | 9 | ||||
-rw-r--r-- | zephyr/program/nissa/it8xxx2_program.conf | 1 | ||||
-rw-r--r-- | zephyr/program/nissa/npcx_program.conf | 1 | ||||
-rw-r--r-- | zephyr/program/nissa/yaviks/project.conf | 1 | ||||
-rw-r--r-- | zephyr/program/skyrim/frostflow/project.conf | 1 |
14 files changed, 2 insertions, 30 deletions
diff --git a/zephyr/boards/arm/mec1727/mec1727_defconfig b/zephyr/boards/arm/mec1727/mec1727_defconfig index b99bd0a487..8fe8e9bca1 100644 --- a/zephyr/boards/arm/mec1727/mec1727_defconfig +++ b/zephyr/boards/arm/mec1727/mec1727_defconfig @@ -35,7 +35,6 @@ CONFIG_CLOCK_CONTROL=y # WATCHDOG configuration CONFIG_WATCHDOG=y -CONFIG_WDT_XEC=y # Power Management #CONFIG_PM=y @@ -44,7 +43,6 @@ CONFIG_WDT_XEC=y # BBRAM CONFIG_BBRAM=y -CONFIG_BBRAM_XEC=y # SPI CONFIG_SPI=y @@ -52,7 +50,6 @@ CONFIG_SPI=y # Flash CONFIG_FLASH=y -CONFIG_SPI_NOR=y # disabling this causes build error: calling function to read JEDEC ID # MEC1727 internal SST25PF040 does not support SFDP CONFIG_FLASH_JESD216_API=y diff --git a/zephyr/boards/arm/npcx7/npcx7_defconfig b/zephyr/boards/arm/npcx7/npcx7_defconfig index f84f44f9e3..5df1dfd966 100644 --- a/zephyr/boards/arm/npcx7/npcx7_defconfig +++ b/zephyr/boards/arm/npcx7/npcx7_defconfig @@ -40,12 +40,10 @@ CONFIG_UART_CONSOLE_INPUT_EXPIRED=y # BBRAM CONFIG_BBRAM=y -CONFIG_BBRAM_NPCX=y # SPI CONFIG_SPI=y # Flash CONFIG_FLASH=y -CONFIG_SPI_NOR=y CONFIG_FLASH_JESD216_API=y diff --git a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig index 8238d10e03..74333fce14 100644 --- a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig +++ b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig @@ -41,12 +41,10 @@ CONFIG_UART_CONSOLE_INPUT_EXPIRED=y # BBRAM CONFIG_BBRAM=y -CONFIG_BBRAM_NPCX=y # SPI CONFIG_SPI=y # Flash CONFIG_FLASH=y -CONFIG_SPI_NOR=y CONFIG_FLASH_JESD216_API=y diff --git a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig index 1cb02182da..82c088a754 100644 --- a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig +++ b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig @@ -41,12 +41,10 @@ CONFIG_UART_CONSOLE_INPUT_EXPIRED=y # BBRAM CONFIG_BBRAM=y -CONFIG_BBRAM_NPCX=y # SPI CONFIG_SPI=y # Flash CONFIG_FLASH=y -CONFIG_SPI_NOR=y CONFIG_FLASH_JESD216_API=y diff --git a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig index 755d982eef..e371d4e518 100644 --- a/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig +++ b/zephyr/boards/arm/npcx_evb/npcx7_evb_defconfig @@ -48,12 +48,10 @@ CONFIG_UART_CONSOLE_INPUT_EXPIRED=y # BBRAM CONFIG_BBRAM=y -CONFIG_BBRAM_NPCX=y # SPI CONFIG_SPI=y # Flash CONFIG_FLASH=y -CONFIG_SPI_NOR=y CONFIG_FLASH_JESD216_API=y diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig index bdedd931c1..7bcfc4ef47 100644 --- a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig +++ b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig @@ -45,12 +45,10 @@ CONFIG_UART_CONSOLE_INPUT_EXPIRED=y # BBRAM CONFIG_BBRAM=y -CONFIG_BBRAM_NPCX=y # SPI CONFIG_SPI=y # Flash CONFIG_FLASH=y -CONFIG_SPI_NOR=y CONFIG_FLASH_JESD216_API=y diff --git a/zephyr/program/geralt/program.conf b/zephyr/program/geralt/program.conf index 1569496f43..501afdee7c 100644 --- a/zephyr/program/geralt/program.conf +++ b/zephyr/program/geralt/program.conf @@ -121,9 +121,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO=y CONFIG_PLATFORM_EC_HOST_COMMAND_STATUS=y -# LED -CONFIG_PLATFORM_EC_LED_DT=y - # PWM CONFIG_PWM=y diff --git a/zephyr/program/herobrine/evoker/project.conf b/zephyr/program/herobrine/evoker/project.conf index 8bd1052faa..0e70563c73 100644 --- a/zephyr/program/herobrine/evoker/project.conf +++ b/zephyr/program/herobrine/evoker/project.conf @@ -22,6 +22,4 @@ CONFIG_PLATFORM_EC_USBA=n CONFIG_PLATFORM_EC_PCF85063A_CAP_SEL=y # Temperature sensor support -CONFIG_PLATFORM_EC_TEMP_SENSOR=y -CONFIG_PLATFORM_EC_THERMISTOR=y CONFIG_PLATFORM_EC_TEMP_SENSOR_FIRST_READ_DELAY=y diff --git a/zephyr/program/intelrvp/adlrvp/adlrvp_mchp/prj.conf b/zephyr/program/intelrvp/adlrvp/adlrvp_mchp/prj.conf index d7220368a2..fdcad31e53 100644 --- a/zephyr/program/intelrvp/adlrvp/adlrvp_mchp/prj.conf +++ b/zephyr/program/intelrvp/adlrvp/adlrvp_mchp/prj.conf @@ -20,7 +20,6 @@ CONFIG_MCHP_MEC_UNSIGNED_HEADER=y CONFIG_MCHP_MEC_HEADER_FLASH_SIZE_256K=y # Support Zephyr SPI NOR driver to work with MCHP SPI driver -CONFIG_SPI_NOR=y CONFIG_SPI_XEC_QMSPI_FULL_DUPLEX=y # Sensors - MCHP TACH driver under sensor diff --git a/zephyr/program/intelrvp/mtlrvp/mtlrvpp_mchp/prj.conf b/zephyr/program/intelrvp/mtlrvp/mtlrvpp_mchp/prj.conf index 9cb6c3af6f..1992284d49 100644 --- a/zephyr/program/intelrvp/mtlrvp/mtlrvpp_mchp/prj.conf +++ b/zephyr/program/intelrvp/mtlrvp/mtlrvpp_mchp/prj.conf @@ -3,7 +3,6 @@ # found in the LICENSE file. CONFIG_BOARD_MTLRVP_MCHP=y -CONFIG_CROS_FLASH_XEC=y CONFIG_CROS_SYSTEM_XEC=y CONFIG_CROS_KB_RAW_XEC=n CONFIG_SYSCON=n @@ -26,7 +25,6 @@ CONFIG_MCHP_MEC_UNSIGNED_HEADER=y CONFIG_MCHP_MEC_HEADER_FLASH_SIZE_256K=y # Support Zephyr SPI NOR driver to work with MCHP SPI driver -CONFIG_SPI_NOR=y CONFIG_SPI_XEC_QMSPI_FULL_DUPLEX=y # PWM @@ -36,14 +34,11 @@ CONFIG_PWM_SHELL=n # Fan / PWM / TACH support CONFIG_SENSOR=y CONFIG_SENSOR_SHELL=n -CONFIG_PLATFORM_EC_FAN=y -CONFIG_PWM_XEC=y -CONFIG_TACH_XEC=y -#RTC +# RTC CONFIG_PLATFORM_EC_RTC=n -#Zephyr debug options +# Zephyr debug options CONFIG_LOG=y # Enable flash console commands CONFIG_PLATFORM_EC_CONSOLE_CMD_FLASH=y diff --git a/zephyr/program/nissa/it8xxx2_program.conf b/zephyr/program/nissa/it8xxx2_program.conf index 34efad46cd..f15e5123ab 100644 --- a/zephyr/program/nissa/it8xxx2_program.conf +++ b/zephyr/program/nissa/it8xxx2_program.conf @@ -53,6 +53,5 @@ CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV=15000 CONFIG_PLATFORM_EC_USB_PD_DPS=n # VSENSE: PP3300_S5 & PP1050_PROC -CONFIG_VCMP_IT8XXX2=y CONFIG_SENSOR=y CONFIG_SENSOR_SHELL=n diff --git a/zephyr/program/nissa/npcx_program.conf b/zephyr/program/nissa/npcx_program.conf index 54b70d35a3..304ff7b378 100644 --- a/zephyr/program/nissa/npcx_program.conf +++ b/zephyr/program/nissa/npcx_program.conf @@ -39,7 +39,6 @@ CONFIG_PLATFORM_EC_CHARGER_RAA489000=y CONFIG_PLATFORM_EC_OCPC_DEF_RBATT_MOHMS=22 # VSENSE: PP3300_S5 & PP1050_PROC -CONFIG_ADC_CMP_NPCX=y CONFIG_ADC_CMP_NPCX_WORKQUEUE=y CONFIG_ADC_CMP_NPCX_WORKQUEUE_PRIORITY=12 CONFIG_SENSOR=y diff --git a/zephyr/program/nissa/yaviks/project.conf b/zephyr/program/nissa/yaviks/project.conf index fdf3081ddc..fe1483ddf6 100644 --- a/zephyr/program/nissa/yaviks/project.conf +++ b/zephyr/program/nissa/yaviks/project.conf @@ -27,7 +27,6 @@ CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD=y CONFIG_PLATFORM_EC_KBLIGHT_ENABLE_PIN=n # Fan -CONFIG_PLATFORM_EC_FAN=y CONFIG_PLATFORM_EC_CUSTOM_FAN_CONTROL=y # LED diff --git a/zephyr/program/skyrim/frostflow/project.conf b/zephyr/program/skyrim/frostflow/project.conf index bb9f6486d8..072cb8ddd0 100644 --- a/zephyr/program/skyrim/frostflow/project.conf +++ b/zephyr/program/skyrim/frostflow/project.conf @@ -26,5 +26,4 @@ CONFIG_BOARD_USB_HUB_RESET=n CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y # Fan -CONFIG_PLATFORM_EC_FAN=y CONFIG_PLATFORM_EC_CUSTOM_FAN_CONTROL=y |