diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-07-18 11:53:25 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-20 20:00:30 +0000 |
| commit | e4996870081fa1de9dc56b752bf31f5692c3d20d (patch) | |
| tree | a01c25a5960a4a3c16572c57024803a6bb3f9b0e | |
| parent | 02697b8e382f34b2b5a1560c67cb5eff4ce86519 (diff) | |
| download | chrome-ec-e4996870081fa1de9dc56b752bf31f5692c3d20d.tar.gz | |
ec: Fix kconfig_check usage in makefile
BRANCH=None
BUG=b:239199935
TEST=make -j$(nproc) buildall && echo SUCCESS
TEST=git commit --allow-empty
./util/compare_build.sh -b dartmonkey
./util/compare_build.sh -b all
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I845ca84920af1ca33457b79fe2a3892867ed693c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3767853
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | Makefile.rules | 11 | ||||
| -rwxr-xr-x | util/compare_build.sh | 2 | ||||
| -rw-r--r-- | util/config_allowed.txt | 9 |
3 files changed, 18 insertions, 4 deletions
diff --git a/Makefile.rules b/Makefile.rules index ab3281a0b7..0a09f78b45 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -233,6 +233,11 @@ print-boards: $(call cmd_pretty_print_list,\ $(sort $(boards))) +# The zephyr path can be overridden on invocation, as in the following example: +# $ make ZEPHYR_BASE=~/zephyr/main BOARD=dartmonkey +ZEPHYR_BASE ?= $(abspath ../../../src/third_party/zephyr/main) +export ZEPHYR_BASE + ifeq ($(ALLOW_CONFIG),) # These are options defined by both ECOS and Zephyr. We need to tolerate this @@ -254,11 +259,9 @@ conflicting_options := \ SPI \ UART_CONSOLE -cmd_check_allowed = \ - ZEPHYR_BASE=$(abspath ../../../src/third_party/zephyr/main) \ - ./util/kconfig_check.py -c ${config} \ +cmd_check_allowed = ./util/kconfig_check.py -c ${config} \ -a util/config_allowed.txt -p PLATFORM_EC_ -s zephyr/ \ - -I $(abspath ../../../src/third_party/zephyr/main) \ + -I "${ZEPHYR_BASE}" \ $(foreach opt,$(conflicting_options),-i $(opt)) check else cmd_check_allowed = true diff --git a/util/compare_build.sh b/util/compare_build.sh index 1b6030453a..c47a951ea8 100755 --- a/util/compare_build.sh +++ b/util/compare_build.sh @@ -216,6 +216,7 @@ echo "# Preparing Makefile" cat > "${TMP_DIR}/Makefile" <<HEREDOC ORIGIN ?= $(realpath .) CRYPTOC_DIR ?= $(realpath ../../third_party/cryptoc) +ZEPHYR_BASE ?= $(realpath ../../../src/third_party/zephyr/main) BOARDS ?= ${BOARDS[*]} LINKS ?= ${LINKS[*]} @@ -233,6 +234,7 @@ build-%: ec-% \$(MAKE) --no-print-directory -C \$(@:build-%=ec-%) \\ STATIC_VERSION=1 \\ CRYPTOC_DIR=\$(CRYPTOC_DIR) \\ + ZEPHYR_BASE=\$(ZEPHYR_BASE) \\ \$(addprefix proj-,\$(BOARDS)) @printf " MKDIR %s\n" "\$@" @mkdir -p \$@ diff --git a/util/config_allowed.txt b/util/config_allowed.txt index c87d468053..1778a5ce4d 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -59,6 +59,7 @@ CONFIG_AP_HANG_DETECT CONFIG_AP_WARM_RESET_INTERRUPT CONFIG_ARMV7M_CACHE CONFIG_ASSEMBLY_MULA32 +CONFIG_AUDIO_CODEC CONFIG_AUDIO_CODEC_ CONFIG_AUDIO_CODEC_CAP_WOV_AUDIO_SHM CONFIG_AUDIO_CODEC_CAP_WOV_LANG_SHM @@ -344,6 +345,7 @@ CONFIG_CTN730 CONFIG_CTS_TASK_LIST CONFIG_CURVE25519 CONFIG_CUSTOM_FAN_CONTROL +CONFIG_DAC CONFIG_DATA_RAM_SIZE CONFIG_DEBUG_BRINGUP CONFIG_DEBUG_DISABLE_WRITE_BUFFER @@ -362,6 +364,7 @@ CONFIG_DFU_BOOTMANAGER_MAIN CONFIG_DFU_BOOTMANAGER_MAX_REBOOT_COUNT CONFIG_DFU_BOOTMANAGER_SHARED CONFIG_DFU_RUNTIME +CONFIG_DMA CONFIG_DMA_DEFAULT_HANDLERS CONFIG_DMA_HELP CONFIG_DMA_PAGING @@ -506,6 +509,7 @@ CONFIG_HOSYCMD_BATTERY_V2 CONFIG_HWTIMER_64BIT CONFIG_HW_CRC CONFIG_HW_SPECIFIC_UDELAY +CONFIG_I2C_BITBANG CONFIG_I2C_BUS_MAY_BE_UNPOWERED CONFIG_I2C_CHIP_MAX_TRANSFER_SIZE CONFIG_I2C_CONTROLLER @@ -521,6 +525,7 @@ CONFIG_I2C_SCL_GATE_PORT CONFIG_I2C_UPDATE_IF_CHANGED CONFIG_I2C_XFER_BOARD_CALLBACK CONFIG_I2C_XFER_LARGE_TRANSFER +CONFIG_INA219 CONFIG_INA231 CONFIG_INA3221 CONFIG_INDUCTIVE_CHARGING @@ -687,6 +692,7 @@ CONFIG_PANIC_DRAM_SIZE CONFIG_PANIC_STRIP_GPR CONFIG_PD_RETRY_COUNT CONFIG_PD_USE_DAC_AS_REF +CONFIG_PECI CONFIG_PECI_COMMON CONFIG_PECI_TJMAX CONFIG_PLATFORM_EC_ @@ -712,6 +718,7 @@ CONFIG_PRINTF_LONG_IS_32BITS CONFIG_PRINT_IN_INT CONFIG_PROGRAM_MEMORY_BASE CONFIG_PROGRAM_MEMORY_BASE_LOAD +CONFIG_PS2 CONFIG_PSTORE CONFIG_PVD CONFIG_PWM_INPUT_LFCLK @@ -796,6 +803,7 @@ CONFIG_SMBUS CONFIG_SOFTWARE_CLZ CONFIG_SOFTWARE_CTZ CONFIG_SOMETHING +CONFIG_SPI CONFIG_SPI_ACCEL_PORT CONFIG_SPI_CONTROLLER CONFIG_SPI_CS_GPIO @@ -900,6 +908,7 @@ CONFIG_TOUCHPAD_VIRTUAL_SIZE CONFIG_TRICKLE_CHARGING CONFIG_TUSB544_EQ_BY_REGISTER CONFIG_UART_BAUD_RATE +CONFIG_UART_CONSOLE CONFIG_UART_HOST CONFIG_UART_HOST_COMMAND_BAUD_RATE CONFIG_UART_HOST_COMMAND_HW |