diff options
Diffstat (limited to 'zephyr/app')
| -rw-r--r-- | zephyr/app/ec/Kconfig | 26 | ||||
| -rw-r--r-- | zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c | 7 | ||||
| -rw-r--r-- | zephyr/app/ec/ec_app_main.c | 10 | ||||
| -rw-r--r-- | zephyr/app/ec/main_shim.c | 3 |
4 files changed, 9 insertions, 37 deletions
diff --git a/zephyr/app/ec/Kconfig b/zephyr/app/ec/Kconfig index 72c80f5d3a..fbf6185740 100644 --- a/zephyr/app/ec/Kconfig +++ b/zephyr/app/ec/Kconfig @@ -27,14 +27,6 @@ config NUM_PREEMPT_PRIORITIES default 26 # -# Override the LOG_PRINTK to be no as it currently makes multiple -# tests timeout and a few others fail in console assertions -# TODO(b/http://b/260772137) Fix LOG_PRINTK issue and remove override -# -config LOG_PRINTK - default n - -# # In Zephyr, the default system workqueue thread priority level is the lowest # cooperative priority. Override its priority to the second lowest preempt # priority. (i.e. NUM_PREEMPT_PRIORITIES - 1) @@ -162,22 +154,4 @@ config SHIMMED_TASKS build. The CROS_EC_TASK_LIST defines a list of CROS_EC_TASK that should be shimmed in. -# -# These shell options are turned off by MINIMAL_SHELL, but are important to us; -# override Zephyr's default to keep them on. -# -config SHELL_HISTORY - default y - -config SHELL_TAB - default y - -config SHELL_TAB_AUTOCOMPLETION - default y if SHELL_TAB - -config SHELL_HELP - default y - -config KERNEL_SHELL - default y endif # CROS_EC diff --git a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c index 3c623b5aac..6109964cb9 100644 --- a/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c +++ b/zephyr/app/ec/chip/riscv/riscv-ite/it8xxx2-espi.c @@ -2,12 +2,11 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include <zephyr/devicetree.h> -#include <zephyr/logging/log.h> - +#include <soc_espi.h> #include <ap_power/ap_power.h> #include <chipset.h> -#include <soc_espi.h> +#include <zephyr/devicetree.h> +#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(ec_chip_it8xxx2_espi, CONFIG_ESPI_LOG_LEVEL); diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c index 4ab5fd3a44..9b13c8ab86 100644 --- a/zephyr/app/ec/ec_app_main.c +++ b/zephyr/app/ec/ec_app_main.c @@ -3,11 +3,14 @@ * found in the LICENSE file. */ +#include <zephyr/kernel.h> +#include <zephyr/sys/printk.h> +#include <zephyr/shell/shell_uart.h> + #include "ap_power/ap_pwrseq.h" #include "button.h" #include "chipset.h" #include "cros_board_info.h" -#include "ec_app_main.h" #include "ec_tasks.h" #include "hooks.h" #include "keyboard_scan.h" @@ -16,10 +19,7 @@ #include "vboot.h" #include "watchdog.h" #include "zephyr_espi_shim.h" - -#include <zephyr/kernel.h> -#include <zephyr/shell/shell_uart.h> -#include <zephyr/sys/printk.h> +#include "ec_app_main.h" /* For testing purposes this is not named main. See main_shim.c for the real * main() function. diff --git a/zephyr/app/ec/main_shim.c b/zephyr/app/ec/main_shim.c index 0ec92b70bf..a14cff2dcb 100644 --- a/zephyr/app/ec/main_shim.c +++ b/zephyr/app/ec/main_shim.c @@ -3,11 +3,10 @@ * found in the LICENSE file. */ +#include <zephyr/kernel.h> #include "ec_app_main.h" #include "host_command.h" -#include <zephyr/kernel.h> - /** A stub main to call the real ec app main function. LCOV_EXCL_START */ void main(void) { |