summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/coffeecake/usb_pd_policy.c2
-rw-r--r--board/dingdong/usb_pd_policy.c2
-rw-r--r--board/hoho/usb_pd_policy.c2
-rw-r--r--board/plankton/usb_pd_policy.c2
-rw-r--r--board/zinger/board.c2
-rw-r--r--chip/it83xx/system.c2
-rw-r--r--chip/mchp/lfw/ec_lfw.c2
-rw-r--r--chip/mec1322/lfw/ec_lfw.c2
-rw-r--r--chip/mt_scp/system.c2
-rw-r--r--chip/stm32/system.c2
-rw-r--r--common/fmap.c2
-rw-r--r--common/rwsig.c2
-rw-r--r--common/system.c2
-rw-r--r--common/usb_pd_policy.c2
-rw-r--r--common/usb_pd_protocol.c2
-rw-r--r--common/usbc/usb_prl_sm.c2
-rw-r--r--common/usbc/usbc_task.c2
-rw-r--r--common/version.c2
-rw-r--r--include/cros_version.h (renamed from include/version.h)0
19 files changed, 18 insertions, 18 deletions
diff --git a/board/coffeecake/usb_pd_policy.c b/board/coffeecake/usb_pd_policy.c
index 6da20a5b37..f24c941832 100644
--- a/board/coffeecake/usb_pd_policy.c
+++ b/board/coffeecake/usb_pd_policy.c
@@ -8,6 +8,7 @@
#include "charger/sy21612.h"
#include "common.h"
#include "console.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "gpio.h"
#include "hooks.h"
@@ -18,7 +19,6 @@
#include "usb_bb.h"
#include "usb_pd.h"
#include "util.h"
-#include "version.h"
#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
diff --git a/board/dingdong/usb_pd_policy.c b/board/dingdong/usb_pd_policy.c
index f17802c82a..09a0f9cc01 100644
--- a/board/dingdong/usb_pd_policy.c
+++ b/board/dingdong/usb_pd_policy.c
@@ -7,6 +7,7 @@
#include "board.h"
#include "common.h"
#include "console.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "gpio.h"
#include "hooks.h"
@@ -17,7 +18,6 @@
#include "usb_bb.h"
#include "usb_api.h"
#include "usb_pd.h"
-#include "version.h"
#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
diff --git a/board/hoho/usb_pd_policy.c b/board/hoho/usb_pd_policy.c
index 4fe82320e8..d2bb172286 100644
--- a/board/hoho/usb_pd_policy.c
+++ b/board/hoho/usb_pd_policy.c
@@ -7,6 +7,7 @@
#include "board.h"
#include "common.h"
#include "console.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "gpio.h"
#include "hooks.h"
@@ -17,7 +18,6 @@
#include "usb_bb.h"
#include "usb_pd.h"
#include "util.h"
-#include "version.h"
#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
diff --git a/board/plankton/usb_pd_policy.c b/board/plankton/usb_pd_policy.c
index f6701ab65e..5bceceaf6c 100644
--- a/board/plankton/usb_pd_policy.c
+++ b/board/plankton/usb_pd_policy.c
@@ -7,6 +7,7 @@
#include "board.h"
#include "common.h"
#include "console.h"
+#include "cros_version.h"
#include "gpio.h"
#include "hooks.h"
#include "registers.h"
@@ -14,7 +15,6 @@
#include "timer.h"
#include "util.h"
#include "usb_pd.h"
-#include "version.h"
#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
diff --git a/board/zinger/board.c b/board/zinger/board.c
index 74da1ca9eb..b3784fde33 100644
--- a/board/zinger/board.c
+++ b/board/zinger/board.c
@@ -5,6 +5,7 @@
/* Tiny charger configuration */
#include "common.h"
+#include "cros_version.h"
#include "debug_printf.h"
#include "ec_commands.h"
#include "registers.h"
@@ -15,7 +16,6 @@
#include "task.h"
#include "usb_pd.h"
#include "util.h"
-#include "version.h"
/* Large 768-Byte buffer for RSA computation : could be re-use afterwards... */
static uint32_t rsa_workbuf[3 * RSANUMWORDS];
diff --git a/chip/it83xx/system.c b/chip/it83xx/system.c
index 0984e4bce1..6f92c134de 100644
--- a/chip/it83xx/system.c
+++ b/chip/it83xx/system.c
@@ -7,6 +7,7 @@
#include "console.h"
#include "cpu.h"
+#include "cros_version.h"
#include "ec2i_chip.h"
#include "flash.h"
#include "hooks.h"
@@ -16,7 +17,6 @@
#include "system.h"
#include "task.h"
#include "util.h"
-#include "version.h"
#include "watchdog.h"
void system_hibernate(uint32_t seconds, uint32_t microseconds)
diff --git a/chip/mchp/lfw/ec_lfw.c b/chip/mchp/lfw/ec_lfw.c
index edd945037c..8bf52efe49 100644
--- a/chip/mchp/lfw/ec_lfw.c
+++ b/chip/mchp/lfw/ec_lfw.c
@@ -9,6 +9,7 @@
#include <stdint.h>
#include "config.h"
+#include "cros_version.h"
#include "gpio.h"
#include "spi.h"
#include "spi_flash.h"
@@ -19,7 +20,6 @@
#include "cpu.h"
#include "clock.h"
#include "system.h"
-#include "version.h"
#include "hwtimer.h"
#include "gpio_list.h"
#include "tfdp_chip.h"
diff --git a/chip/mec1322/lfw/ec_lfw.c b/chip/mec1322/lfw/ec_lfw.c
index 39f4e378ae..9db5f7717f 100644
--- a/chip/mec1322/lfw/ec_lfw.c
+++ b/chip/mec1322/lfw/ec_lfw.c
@@ -9,6 +9,7 @@
#include <stdint.h>
#include "config.h"
+#include "cros_version.h"
#include "gpio.h"
#include "spi.h"
#include "spi_flash.h"
@@ -19,7 +20,6 @@
#include "cpu.h"
#include "clock.h"
#include "system.h"
-#include "version.h"
#include "hwtimer.h"
#include "gpio_list.h"
diff --git a/chip/mt_scp/system.c b/chip/mt_scp/system.c
index 6bd2e76644..dc822e47d5 100644
--- a/chip/mt_scp/system.c
+++ b/chip/mt_scp/system.c
@@ -8,6 +8,7 @@
#include "clock_chip.h"
#include "console.h"
#include "cpu.h"
+#include "cros_version.h"
#include "flash.h"
#include "hooks.h"
#include "host_command.h"
@@ -16,7 +17,6 @@
#include "system.h"
#include "task.h"
#include "util.h"
-#include "version.h"
#include "watchdog.h"
/*
diff --git a/chip/stm32/system.c b/chip/stm32/system.c
index aad35820c7..aec36a48dd 100644
--- a/chip/stm32/system.c
+++ b/chip/stm32/system.c
@@ -9,6 +9,7 @@
#include "clock.h"
#include "console.h"
#include "cpu.h"
+#include "cros_version.h"
#include "flash.h"
#include "gpio_chip.h"
#include "hooks.h"
@@ -18,7 +19,6 @@
#include "system.h"
#include "task.h"
#include "util.h"
-#include "version.h"
#include "watchdog.h"
#ifdef CONFIG_STM32_CLOCK_LSE
diff --git a/common/fmap.c b/common/fmap.c
index 001f83a184..289883abce 100644
--- a/common/fmap.c
+++ b/common/fmap.c
@@ -7,9 +7,9 @@
#include <stddef.h>
#include "common.h"
+#include "cros_version.h"
#include "rwsig.h"
#include "util.h"
-#include "version.h"
/*
* FMAP structs.
diff --git a/common/rwsig.c b/common/rwsig.c
index 4ed356f472..3a5bcd98d8 100644
--- a/common/rwsig.c
+++ b/common/rwsig.c
@@ -8,6 +8,7 @@
*/
#include "console.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "flash.h"
#include "host_command.h"
@@ -22,7 +23,6 @@
#include "util.h"
#include "vb21_struct.h"
#include "vboot.h"
-#include "version.h"
/* Console output macros */
#define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ## args)
diff --git a/common/system.c b/common/system.c
index e657859160..068e6bb37d 100644
--- a/common/system.c
+++ b/common/system.c
@@ -35,7 +35,7 @@
#include "usb_pd.h"
#include "usb_pd_tcpm.h"
#include "util.h"
-#include "version.h"
+#include "cros_version.h"
#include "watchdog.h"
/* Console output macros */
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 89c87aacf5..bdf07452b7 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -7,6 +7,7 @@
#include "charge_manager.h"
#include "common.h"
#include "console.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "flash.h"
#include "gpio.h"
@@ -26,7 +27,6 @@
#include "usb_mux.h"
#include "usb_pd.h"
#include "usbc_ppc.h"
-#include "version.h"
#ifdef CONFIG_COMMON_RUNTIME
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index c186696d4c..dd0eaa8c05 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -12,6 +12,7 @@
#include "chipset.h"
#include "common.h"
#include "console.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "gpio.h"
#include "hooks.h"
@@ -32,7 +33,6 @@
#include "usb_pd_tcpc.h"
#include "usbc_ocp.h"
#include "usbc_ppc.h"
-#include "version.h"
#include "vboot.h"
/* Flags to clear on a disconnect */
diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c
index 00a4cecfeb..834d2d6f2b 100644
--- a/common/usbc/usb_prl_sm.c
+++ b/common/usbc/usb_prl_sm.c
@@ -11,6 +11,7 @@
#include "chipset.h"
#include "common.h"
#include "console.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "gpio.h"
#include "hooks.h"
@@ -30,7 +31,6 @@
#include "usb_emsg.h"
#include "usb_sm.h"
#include "vpd_api.h"
-#include "version.h"
#ifdef CONFIG_COMMON_RUNTIME
#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
diff --git a/common/usbc/usbc_task.c b/common/usbc/usbc_task.c
index d0833d9103..df9190c955 100644
--- a/common/usbc/usbc_task.c
+++ b/common/usbc/usbc_task.c
@@ -11,6 +11,7 @@
#include "chipset.h"
#include "common.h"
#include "console.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "gpio.h"
#include "hooks.h"
@@ -30,7 +31,6 @@
#include "usb_sm.h"
#include "usb_tc_sm.h"
#include "usbc_ppc.h"
-#include "version.h"
#define USBC_EVENT_TIMEOUT (5 * MSEC)
diff --git a/common/version.c b/common/version.c
index 1888fc0aef..c854e2b39f 100644
--- a/common/version.c
+++ b/common/version.c
@@ -8,11 +8,11 @@
#include <stdint.h>
#include "common.h"
#include "compile_time_macros.h"
+#include "cros_version.h"
#include "ec_commands.h"
#include "ec_version.h"
#include "stddef.h"
#include "system.h"
-#include "version.h"
BUILD_ASSERT(CONFIG_ROLLBACK_VERSION >= 0);
BUILD_ASSERT(CONFIG_ROLLBACK_VERSION <= INT32_MAX);
diff --git a/include/version.h b/include/cros_version.h
index 0d3e777dc5..0d3e777dc5 100644
--- a/include/version.h
+++ b/include/cros_version.h
View Lorry Controller Status