util: remove unused includes

Remove these includes as they're not needed in this header. Instead,
the includes should go where they're actually being used.

BRANCH=none
BUG=b:240574048
TEST=make buildall -j
TEST=zmake build -a

Signed-off-by: Yuval Peress <peress@google.com>
Change-Id: I64b10af3216654b2a20caa1cabd267661a0bca39
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3791980
Reviewed-by: Tristan Honscheid <honscheid@google.com>
Commit-Queue: Tristan Honscheid <honscheid@google.com>

49 files changed, 51 insertions, 1 deletions

diff --git a/chip/host/flash.c b/chip/host/flash.c
index 5d895222e7..7f20a80939 100644
--- a/chip/host/flash.c
+++ b/chip/host/flash.c
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "config_chip.h"
 #include "flash.h"
diff --git a/chip/host/persistence.c b/chip/host/persistence.c
index d23615d1ec..d4535e3512 100644
--- a/chip/host/persistence.c
+++ b/chip/host/persistence.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "builtin/assert.h"
 #include "util.h"
 
 /* The longest path in a chroot seems to be about 280 characters (as of
diff --git a/chip/host/system.c b/chip/host/system.c
index 0a362a0ffd..511c6d29de 100644
--- a/chip/host/system.c
+++ b/chip/host/system.c
@@ -5,6 +5,7 @@
 
 /* System module for emulator */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "ec_commands.h"
 #include "host_test.h"
diff --git a/chip/host/uart.c b/chip/host/uart.c
index 4c8474bcaa..cc40e516fa 100644
--- a/chip/host/uart.c
+++ b/chip/host/uart.c
@@ -11,6 +11,7 @@
 #include <termio.h>
 #include <unistd.h>
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "queue.h"
 #include "task.h"
diff --git a/chip/host/usb_pd_phy.c b/chip/host/usb_pd_phy.c
index eb77c1eecd..1543418249 100644
--- a/chip/host/usb_pd_phy.c
+++ b/chip/host/usb_pd_phy.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "crc.h"
diff --git a/chip/ish/heci.c b/chip/ish/heci.c
index 6adcece752..c0ba042512 100644
--- a/chip/ish/heci.c
+++ b/chip/ish/heci.c
@@ -4,6 +4,7 @@
  */
 
 #include "atomic.h"
+#include "builtin/assert.h"
 #include "compile_time_macros.h"
 #include "console.h"
 #include "hbm.h"
diff --git a/chip/ish/ipc_heci.c b/chip/ish/ipc_heci.c
index 84dbba9866..bd9b170f29 100644
--- a/chip/ish/ipc_heci.c
+++ b/chip/ish/ipc_heci.c
@@ -23,6 +23,7 @@
  *  - Doorbell Clear Status Register (DB CSR)
  */
 
+#include "builtin/assert.h"
 #include "registers.h"
 #include "console.h"
 #include "task.h"
diff --git a/chip/it83xx/gpio.c b/chip/it83xx/gpio.c
index 99603c26a5..4b6bfaee57 100644
--- a/chip/it83xx/gpio.c
+++ b/chip/it83xx/gpio.c
@@ -5,6 +5,7 @@
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "gpio.h"
diff --git a/chip/it83xx/i2c.c b/chip/it83xx/i2c.c
index 7dc41a7eb4..ba9d5fc034 100644
--- a/chip/it83xx/i2c.c
+++ b/chip/it83xx/i2c.c
@@ -5,6 +5,7 @@
 
 /* I2C module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/chip/it83xx/peci.c b/chip/it83xx/peci.c
index d485b3fccf..4eb97b3853 100644
--- a/chip/it83xx/peci.c
+++ b/chip/it83xx/peci.c
@@ -5,6 +5,7 @@
 
 /* PECI interface for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "hooks.h"
 #include "peci.h"
diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c
index 2d6778b910..28a2de1b56 100644
--- a/chip/it83xx/system.c
+++ b/chip/it83xx/system.c
@@ -14,6 +14,7 @@
 #include "host_command.h"
 #include "intc.h"
 #include "link_defs.h"
+#include "panic.h"
 #include "registers.h"
 #include "system.h"
 #include "task.h"
diff --git a/chip/mec1322/clock.c b/chip/mec1322/clock.c
index 04ee90ee98..f541af53cc 100644
--- a/chip/mec1322/clock.c
+++ b/chip/mec1322/clock.c
@@ -5,6 +5,7 @@
 
 /* Clocks and power management settings */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c
index 58215adae7..ab73483bd2 100644
--- a/chip/mec1322/i2c.c
+++ b/chip/mec1322/i2c.c
@@ -5,6 +5,7 @@
 
 /* I2C port module for MEC1322 */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c
index 3045cd6cff..095308a88b 100644
--- a/chip/mec1322/system.c
+++ b/chip/mec1322/system.c
@@ -5,6 +5,7 @@
 
 /* System module for Chrome EC : MEC1322 hardware specific implementation */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/chip/mt_scp/mt818x/clock_mt8186.c b/chip/mt_scp/mt818x/clock_mt8186.c
index f7a4954232..6cfbde0ec5 100644
--- a/chip/mt_scp/mt818x/clock_mt8186.c
+++ b/chip/mt_scp/mt818x/clock_mt8186.c
@@ -5,6 +5,7 @@
 
 /* Clocks, PLL and power settings */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock_chip.h"
 #include "common.h"
diff --git a/chip/mt_scp/mt818x/system.c b/chip/mt_scp/mt818x/system.c
index 6184b75c27..6e6a8e1e1c 100644
--- a/chip/mt_scp/mt818x/system.c
+++ b/chip/mt_scp/mt818x/system.c
@@ -5,6 +5,7 @@
 
 /* System : hardware specific implementation */
 
+#include "builtin/assert.h"
 #include "clock_chip.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/chip/npcx/flash.c b/chip/npcx/flash.c
index 3067258bb2..9fa39d4176 100644
--- a/chip/npcx/flash.c
+++ b/chip/npcx/flash.c
@@ -5,6 +5,7 @@
 
 /* Flash memory module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "flash.h"
 #include "host_command.h"
 #include "registers.h"
diff --git a/chip/npcx/gpio.c b/chip/npcx/gpio.c
index 55310b1ebf..cae7b13fd2 100644
--- a/chip/npcx/gpio.c
+++ b/chip/npcx/gpio.c
@@ -5,6 +5,7 @@
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "gpio.h"
 #include "gpio_chip.h"
diff --git a/chip/npcx/pwm.c b/chip/npcx/pwm.c
index de39da52a1..905a7bcb25 100644
--- a/chip/npcx/pwm.c
+++ b/chip/npcx/pwm.c
@@ -8,7 +8,7 @@
  * On this chip, the PWM logic is implemented by the hardware FAN modules.
  */
 
-#include "assert.h"
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock_chip.h"
 #include "console.h"
diff --git a/chip/npcx/sha256_chip.c b/chip/npcx/sha256_chip.c
index 0462b752ed..4a92db4bb9 100644
--- a/chip/npcx/sha256_chip.c
+++ b/chip/npcx/sha256_chip.c
@@ -5,6 +5,7 @@
  */
 
 /* SHA256 module for Chrome EC */
+#include "builtin/assert.h"
 #include "common.h"
 #include "sha256.h"
 #include "util.h"
diff --git a/chip/npcx/shi.c b/chip/npcx/shi.c
index 4e7553a8f9..5867a0b658 100644
--- a/chip/npcx/shi.c
+++ b/chip/npcx/shi.c
@@ -10,6 +10,7 @@
  * This uses Input/Output buffer to handle SPI transmission and reception.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "console.h"
diff --git a/chip/npcx/system-npcx5.c b/chip/npcx/system-npcx5.c
index 2fffacd055..b5e2582655 100644
--- a/chip/npcx/system-npcx5.c
+++ b/chip/npcx/system-npcx5.c
@@ -6,6 +6,7 @@
 #include <stdnoreturn.h>
 
 /* System module driver depends on chip series for Chrome EC */
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/chip/npcx/system-npcx7.c b/chip/npcx/system-npcx7.c
index b3a8aec6fd..c0cc748e1c 100644
--- a/chip/npcx/system-npcx7.c
+++ b/chip/npcx/system-npcx7.c
@@ -6,6 +6,7 @@
 #include <stdnoreturn.h>
 
 /* System module driver depends on chip series for Chrome EC */
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/chip/npcx/system-npcx9.c b/chip/npcx/system-npcx9.c
index b3a8aec6fd..c0cc748e1c 100644
--- a/chip/npcx/system-npcx9.c
+++ b/chip/npcx/system-npcx9.c
@@ -6,6 +6,7 @@
 #include <stdnoreturn.h>
 
 /* System module driver depends on chip series for Chrome EC */
+#include "builtin/assert.h"
 #include "common.h"
 #include "console.h"
 #include "cpu.h"
diff --git a/chip/npcx/system.c b/chip/npcx/system.c
index 47909a5f54..c10ce9a01d 100644
--- a/chip/npcx/system.c
+++ b/chip/npcx/system.c
@@ -5,6 +5,7 @@
 
 /* System module for Chrome EC : NPCX hardware specific implementation */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock_chip.h"
 #include "common.h"
@@ -15,6 +16,7 @@
 #include "host_command.h"
 #include "hwtimer_chip.h"
 #include "lct_chip.h"
+#include "panic.h"
 #include "registers.h"
 #include "rom_chip.h"
 #include "sib_chip.h"
diff --git a/chip/stm32/clock-f.c b/chip/stm32/clock-f.c
index 3fdc3bcc43..953c793245 100644
--- a/chip/stm32/clock-f.c
+++ b/chip/stm32/clock-f.c
@@ -5,6 +5,7 @@
 
 /* Clocks and power management settings */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "clock-f.h"
diff --git a/chip/stm32/clock-stm32f4.c b/chip/stm32/clock-stm32f4.c
index 6d8461afc1..1ea7b83ad0 100644
--- a/chip/stm32/clock-stm32f4.c
+++ b/chip/stm32/clock-stm32f4.c
@@ -5,6 +5,7 @@
 
 /* Clocks and power management settings */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "clock-f.h"
diff --git a/chip/stm32/clock-stm32g4.c b/chip/stm32/clock-stm32g4.c
index a46946e22b..da8c0b063d 100644
--- a/chip/stm32/clock-stm32g4.c
+++ b/chip/stm32/clock-stm32g4.c
@@ -5,6 +5,7 @@
 
 /* Clocks configuration routines */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "clock-f.h"
diff --git a/chip/stm32/clock-stm32h7.c b/chip/stm32/clock-stm32h7.c
index bb73d5dc0c..09cf24e3a3 100644
--- a/chip/stm32/clock-stm32h7.c
+++ b/chip/stm32/clock-stm32h7.c
@@ -15,6 +15,7 @@
 
 #include <stdbool.h>
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/clock-stm32l4.c b/chip/stm32/clock-stm32l4.c
index a4227cbc9f..034e0c7dea 100644
--- a/chip/stm32/clock-stm32l4.c
+++ b/chip/stm32/clock-stm32l4.c
@@ -5,6 +5,7 @@
 
 /* Clocks and power management settings for STM32L4xx as well as STM32L5xx. */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "clock-l4.h"
diff --git a/chip/stm32/dma.c b/chip/stm32/dma.c
index e2804ed41d..a36e015ce9 100644
--- a/chip/stm32/dma.c
+++ b/chip/stm32/dma.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"
diff --git a/chip/stm32/flash-f.c b/chip/stm32/flash-f.c
index edbb1fd0db..caa2737099 100644
--- a/chip/stm32/flash-f.c
+++ b/chip/stm32/flash-f.c
@@ -7,6 +7,7 @@
 
 #include <stdbool.h>
 #include "battery.h"
+#include "builtin/assert.h"
 #include "console.h"
 #include "clock.h"
 #include "flash.h"
diff --git a/chip/stm32/flash-stm32l.c b/chip/stm32/flash-stm32l.c
index 592f8f50bf..a36fb8e439 100644
--- a/chip/stm32/flash-stm32l.c
+++ b/chip/stm32/flash-stm32l.c
@@ -5,9 +5,11 @@
 
 /* Flash memory module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "console.h"
 #include "flash.h"
+#include "panic.h"
 #include "registers.h"
 #include "system.h"
 #include "task.h"
diff --git a/chip/stm32/gpio-f0-l.c b/chip/stm32/gpio-f0-l.c
index 51691ba3be..f583e66acc 100644
--- a/chip/stm32/gpio-f0-l.c
+++ b/chip/stm32/gpio-f0-l.c
@@ -9,6 +9,7 @@
  * These functions are shared by the STM32F0 and STM32L variants.
  */
 
+#include "builtin/assert.h"
 #include "common.h"
 #include "gpio_chip.h"
 #include "registers.h"
diff --git a/chip/stm32/gpio-stm32f4.c b/chip/stm32/gpio-stm32f4.c
index 9726bd277f..d95a96ae5b 100644
--- a/chip/stm32/gpio-stm32f4.c
+++ b/chip/stm32/gpio-stm32f4.c
@@ -5,6 +5,7 @@
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "gpio.h"
diff --git a/chip/stm32/gpio-stm32g4.c b/chip/stm32/gpio-stm32g4.c
index ce4baf4313..54f31ba468 100644
--- a/chip/stm32/gpio-stm32g4.c
+++ b/chip/stm32/gpio-stm32g4.c
@@ -5,6 +5,7 @@
 
 /* GPIO module for Chrome EC */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "gpio.h"
diff --git a/chip/stm32/hwtimer.c b/chip/stm32/hwtimer.c
index 652e822f09..2c96cd7b7f 100644
--- a/chip/stm32/hwtimer.c
+++ b/chip/stm32/hwtimer.c
@@ -5,6 +5,7 @@
 
 /* Hardware timers driver */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock-f.h"
 #include "common.h"
diff --git a/chip/stm32/hwtimer32.c b/chip/stm32/hwtimer32.c
index 4a263e72d9..6d0fb86d18 100644
--- a/chip/stm32/hwtimer32.c
+++ b/chip/stm32/hwtimer32.c
@@ -5,6 +5,7 @@
 
 /* Hardware 32-bit timer driver */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock-f.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32f0.c b/chip/stm32/i2c-stm32f0.c
index 7120144c4a..ade084d301 100644
--- a/chip/stm32/i2c-stm32f0.c
+++ b/chip/stm32/i2c-stm32f0.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32f3.c b/chip/stm32/i2c-stm32f3.c
index 7120144c4a..ade084d301 100644
--- a/chip/stm32/i2c-stm32f3.c
+++ b/chip/stm32/i2c-stm32f3.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32f4.c b/chip/stm32/i2c-stm32f4.c
index 11b6cc2f76..cdf4f3d1bd 100644
--- a/chip/stm32/i2c-stm32f4.c
+++ b/chip/stm32/i2c-stm32f4.c
@@ -4,6 +4,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32g4.c b/chip/stm32/i2c-stm32g4.c
index 4da300f45c..995cbdd7c5 100644
--- a/chip/stm32/i2c-stm32g4.c
+++ b/chip/stm32/i2c-stm32g4.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32l.c b/chip/stm32/i2c-stm32l.c
index 582266b14d..c5eff18684 100644
--- a/chip/stm32/i2c-stm32l.c
+++ b/chip/stm32/i2c-stm32l.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "common.h"
diff --git a/chip/stm32/i2c-stm32l4.c b/chip/stm32/i2c-stm32l4.c
index 851adad21c..99db878bd0 100644
--- a/chip/stm32/i2c-stm32l4.c
+++ b/chip/stm32/i2c-stm32l4.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "printf.h"
 #include "chipset.h"
 #include "clock.h"
diff --git a/chip/stm32/power_led.c b/chip/stm32/power_led.c
index ab5f2dcd34..d30e742ca1 100644
--- a/chip/stm32/power_led.c
+++ b/chip/stm32/power_led.c
@@ -15,6 +15,7 @@
  * results in a breathing effect. It takes about 2sec for a full cycle.
  */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/chip/stm32/pwm.c b/chip/stm32/pwm.c
index aadbde08c2..719d4af156 100644
--- a/chip/stm32/pwm.c
+++ b/chip/stm32/pwm.c
@@ -5,6 +5,7 @@
 
 /* PWM control module for STM32 */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "clock-f.h"
 #include "gpio.h"
diff --git a/chip/stm32/spi.c b/chip/stm32/spi.c
index 5d78e9c89a..ca1f4ba6f1 100644
--- a/chip/stm32/spi.c
+++ b/chip/stm32/spi.c
@@ -8,6 +8,7 @@
  * This uses DMA to handle transmission and reception.
  */
 
+#include "builtin/assert.h"
 #include "chipset.h"
 #include "clock.h"
 #include "console.h"
diff --git a/chip/stm32/usb_dwc.c b/chip/stm32/usb_dwc.c
index 75d15dc48f..7201cb8406 100644
--- a/chip/stm32/usb_dwc.c
+++ b/chip/stm32/usb_dwc.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "config.h"
diff --git a/chip/stm32/usb_pd_phy.c b/chip/stm32/usb_pd_phy.c
index 62c18200a9..6acbd09dcf 100644
--- a/chip/stm32/usb_pd_phy.c
+++ b/chip/stm32/usb_pd_phy.c
@@ -4,6 +4,7 @@
  */
 
 #include "adc.h"
+#include "builtin/assert.h"
 #include "clock.h"
 #include "common.h"
 #include "console.h"