diff options
| author | Yuval Peress <peress@chromium.org> | 2021-01-05 23:20:50 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-07 19:22:12 +0000 |
| commit | d541e580f5db52b737a2d7a48046afdd9419d7d6 (patch) | |
| tree | b06bd54f937773364d14b10c14e637bf185ea5e0 /chip | |
| parent | c3981e9ec46b0bb839b06a898bb0e99b760b3058 (diff) | |
| download | chrome-ec-d541e580f5db52b737a2d7a48046afdd9419d7d6.tar.gz | |
version: Rename version.h to cros_version.h
This change simply moves the include/version.h file over to avoid
a naming collision with zephyr's version.h.
BRANCH=none
BUG=b:167392037
TEST=make buildall -j
Signed-off-by: Yuval Peress <peress@chromium.org>
Change-Id: Ib41b3c21817d5f81e713d3b550bc46a0d1c55cf8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2612772
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/it83xx/system.c | 2 | ||||
| -rw-r--r-- | chip/mchp/lfw/ec_lfw.c | 2 | ||||
| -rw-r--r-- | chip/mec1322/lfw/ec_lfw.c | 2 | ||||
| -rw-r--r-- | chip/mt_scp/system.c | 2 | ||||
| -rw-r--r-- | chip/stm32/system.c | 2 |
5 files changed, 5 insertions, 5 deletions
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 |