diff options
author | Matthias Kaehlcke <mka@chromium.org> | 2022-02-14 09:03:29 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2022-02-16 10:45:01 +0000 |
commit | 28cdb3f05934759dc5efaec088ca9cfa02492242 (patch) | |
tree | baa8167c6ad62baa7a39f03516a386654938c35f | |
parent | e9d56cdd0619fd3e6e9a4714391666641c5c333b (diff) | |
download | chrome-ec-28cdb3f05934759dc5efaec088ca9cfa02492242.tar.gz |
herobrine: Rename project to 'herobrine' (was 'herobrine_npcx9')
The NPCX9 is the only EC chip that will be used by herobrine, rename
the project from 'herobrine_npcx9' to 'herobrine'.
BRANCH=None
BUG=b:215771396
TEST=zmake configure -b herobrine
Cq-Depend: chrome-internal:4546687
Change-Id: I206a65f253ce38d1b263a13df6ace90c90a0e450
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3459518
Reviewed-by: Bob Moragues <moragues@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
-rw-r--r-- | .gitlab-ci.yml | 8 | ||||
-rw-r--r-- | board/herobrine/battery.c (renamed from board/herobrine_npcx9/battery.c) | 0 | ||||
-rw-r--r-- | board/herobrine/board.c (renamed from board/herobrine_npcx9/board.c) | 0 | ||||
-rw-r--r-- | board/herobrine/board.h (renamed from board/herobrine_npcx9/board.h) | 0 | ||||
-rw-r--r-- | board/herobrine/build.mk (renamed from board/herobrine_npcx9/build.mk) | 0 | ||||
-rw-r--r-- | board/herobrine/ec.tasklist (renamed from board/herobrine_npcx9/ec.tasklist) | 0 | ||||
-rw-r--r-- | board/herobrine/gpio.inc (renamed from board/herobrine_npcx9/gpio.inc) | 0 | ||||
-rw-r--r-- | board/herobrine/led.c (renamed from board/herobrine_npcx9/led.c) | 0 | ||||
-rw-r--r-- | board/herobrine/switchcap.c (renamed from board/herobrine_npcx9/switchcap.c) | 0 | ||||
-rw-r--r-- | board/herobrine/usbc_config.c (renamed from board/herobrine_npcx9/usbc_config.c) | 0 | ||||
-rw-r--r-- | board/herobrine/usbc_config.h (renamed from board/herobrine_npcx9/usbc_config.h) | 0 | ||||
-rw-r--r-- | board/herobrine/vif_override.xml (renamed from board/herobrine_npcx9/vif_override.xml) | 0 | ||||
-rw-r--r-- | zephyr/projects/herobrine/BUILD.py | 4 | ||||
-rw-r--r-- | zephyr/projects/herobrine/CMakeLists.txt | 6 | ||||
-rw-r--r-- | zephyr/projects/herobrine/Kconfig | 4 | ||||
-rw-r--r-- | zephyr/projects/herobrine/prj_herobrine.conf (renamed from zephyr/projects/herobrine/prj_herobrine_npcx9.conf) | 2 | ||||
-rw-r--r-- | zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c (renamed from zephyr/projects/herobrine/src/herobrine_npcx9/alt_dev_replacement.c) | 0 |
17 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 492ae8c27c..f36cc8b743 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,14 +135,14 @@ seed_cache: when: always coverage: '/lines\.*: \d+\.\d+%/' -herobrine_npcx9: +herobrine: variables: - PROJECT: "herobrine_npcx9" + PROJECT: "herobrine" <<: *build_template -herobrine_npcx9_coverage: +herobrine_coverage: variables: - PROJECT: "herobrine_npcx9" + PROJECT: "herobrine" <<: *coverage_template it8xxx2_evb: diff --git a/board/herobrine_npcx9/battery.c b/board/herobrine/battery.c index f6622f11ee..f6622f11ee 100644 --- a/board/herobrine_npcx9/battery.c +++ b/board/herobrine/battery.c diff --git a/board/herobrine_npcx9/board.c b/board/herobrine/board.c index fea8bf3a88..fea8bf3a88 100644 --- a/board/herobrine_npcx9/board.c +++ b/board/herobrine/board.c diff --git a/board/herobrine_npcx9/board.h b/board/herobrine/board.h index 790d753bbc..790d753bbc 100644 --- a/board/herobrine_npcx9/board.h +++ b/board/herobrine/board.h diff --git a/board/herobrine_npcx9/build.mk b/board/herobrine/build.mk index 601c45a042..601c45a042 100644 --- a/board/herobrine_npcx9/build.mk +++ b/board/herobrine/build.mk diff --git a/board/herobrine_npcx9/ec.tasklist b/board/herobrine/ec.tasklist index 5beeb38feb..5beeb38feb 100644 --- a/board/herobrine_npcx9/ec.tasklist +++ b/board/herobrine/ec.tasklist diff --git a/board/herobrine_npcx9/gpio.inc b/board/herobrine/gpio.inc index 239bedd95d..239bedd95d 100644 --- a/board/herobrine_npcx9/gpio.inc +++ b/board/herobrine/gpio.inc diff --git a/board/herobrine_npcx9/led.c b/board/herobrine/led.c index 295c8effeb..295c8effeb 100644 --- a/board/herobrine_npcx9/led.c +++ b/board/herobrine/led.c diff --git a/board/herobrine_npcx9/switchcap.c b/board/herobrine/switchcap.c index 16b0db6ef6..16b0db6ef6 100644 --- a/board/herobrine_npcx9/switchcap.c +++ b/board/herobrine/switchcap.c diff --git a/board/herobrine_npcx9/usbc_config.c b/board/herobrine/usbc_config.c index 971ec4f006..971ec4f006 100644 --- a/board/herobrine_npcx9/usbc_config.c +++ b/board/herobrine/usbc_config.c diff --git a/board/herobrine_npcx9/usbc_config.h b/board/herobrine/usbc_config.h index 69f546ef85..69f546ef85 100644 --- a/board/herobrine_npcx9/usbc_config.h +++ b/board/herobrine/usbc_config.h diff --git a/board/herobrine_npcx9/vif_override.xml b/board/herobrine/vif_override.xml index 32736caf64..32736caf64 100644 --- a/board/herobrine_npcx9/vif_override.xml +++ b/board/herobrine/vif_override.xml diff --git a/zephyr/projects/herobrine/BUILD.py b/zephyr/projects/herobrine/BUILD.py index 95d041a540..ce0391df35 100644 --- a/zephyr/projects/herobrine/BUILD.py +++ b/zephyr/projects/herobrine/BUILD.py @@ -32,8 +32,8 @@ def register_variant(project_name, extra_dts_overlays=(), extra_kconfig_files=() register_variant( - project_name="herobrine_npcx9", - extra_kconfig_files=[here / "prj_herobrine_npcx9.conf"], + project_name="herobrine", + extra_kconfig_files=[here / "prj_herobrine.conf"], ) diff --git a/zephyr/projects/herobrine/CMakeLists.txt b/zephyr/projects/herobrine/CMakeLists.txt index c306e7f741..24b29ef897 100644 --- a/zephyr/projects/herobrine/CMakeLists.txt +++ b/zephyr/projects/herobrine/CMakeLists.txt @@ -17,10 +17,10 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/i2c.c") -if(DEFINED CONFIG_BOARD_HEROBRINE_NPCX9) - project(herobrine_npcx9) +if(DEFINED CONFIG_BOARD_HEROBRINE) + project(herobrine) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC - "src/herobrine_npcx9/alt_dev_replacement.c") + "src/herobrine/alt_dev_replacement.c") elseif(DEFINED CONFIG_BOARD_HOGLIN) project(hoglin) endif() diff --git a/zephyr/projects/herobrine/Kconfig b/zephyr/projects/herobrine/Kconfig index ccaba5e3e3..36916a01b8 100644 --- a/zephyr/projects/herobrine/Kconfig +++ b/zephyr/projects/herobrine/Kconfig @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -config BOARD_HEROBRINE_NPCX9 - bool "Google Herobrine-NPCX9 Baseboard" +config BOARD_HEROBRINE + bool "Google Herobrine Baseboard" help Build Google Herobrine reference board. The board uses Nuvoton NPCX9 chip as the EC. diff --git a/zephyr/projects/herobrine/prj_herobrine_npcx9.conf b/zephyr/projects/herobrine/prj_herobrine.conf index 1b13f58a2e..f65a44406d 100644 --- a/zephyr/projects/herobrine/prj_herobrine_npcx9.conf +++ b/zephyr/projects/herobrine/prj_herobrine.conf @@ -3,4 +3,4 @@ # found in the LICENSE file. # Herobrine-NPCX9 reference-board-specific Kconfig settings. -CONFIG_BOARD_HEROBRINE_NPCX9=y +CONFIG_BOARD_HEROBRINE=y diff --git a/zephyr/projects/herobrine/src/herobrine_npcx9/alt_dev_replacement.c b/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c index fe3f06fca5..fe3f06fca5 100644 --- a/zephyr/projects/herobrine/src/herobrine_npcx9/alt_dev_replacement.c +++ b/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c |