diff options
| author | Wai-Hong Tam <waihong@google.com> | 2022-01-24 22:46:52 +0000 |
|---|---|---|
| committer | Wai-Hong Tam <waihong@google.com> | 2022-01-24 23:07:09 +0000 |
| commit | 891d468511008d8dce5913deccf687662b318cb8 (patch) | |
| tree | 3a31f87e2a0cffdb150efcc237fde85de0fb9b24 | |
| parent | 74c54185e788c0c88a40c7ad2fc907f346333ddb (diff) | |
| download | chrome-ec-891d468511008d8dce5913deccf687662b318cb8.tar.gz | |
Revert "herobrine: Move alt-component logic to the project subdirectory"
This reverts commit 3b704faa6c1db27adb691cb223159c6aa84aa3ee.
Reason for revert: The herobrine build is broken.
Original change's description:
> herobrine: Move alt-component logic to the project subdirectory
>
> The alternative component logic is very project specific. Create
> an extra subdirectory for this code.
>
> BRANCH=None
> BUG=b:214613810
> TEST=Built the herobrine_npcx9 project and checked it boot correctly
> on the hardware.
>
> Change-Id: Iebbe30b6ccb2d6a013143dee7405f75fc5ff8097
> Signed-off-by: Wai-Hong Tam <waihong@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3390642
> Reviewed-by: Keith Short <keithshort@chromium.org>
Bug: b:214613810
Change-Id: Ieba3768edad7eb36d789406f70e902b443cb6ddc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3413811
Auto-Submit: Wai-Hong Tam <waihong@google.com>
Commit-Queue: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | zephyr/projects/herobrine/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | zephyr/projects/herobrine/src/alt_dev_replacement.c (renamed from zephyr/projects/herobrine/src/herobrine_npcx9/alt_dev_replacement.c) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/zephyr/projects/herobrine/CMakeLists.txt b/zephyr/projects/herobrine/CMakeLists.txt index facf228668..6782d8e4ed 100644 --- a/zephyr/projects/herobrine/CMakeLists.txt +++ b/zephyr/projects/herobrine/CMakeLists.txt @@ -16,9 +16,9 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON "src/led.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C "src/i2c.c") +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC + "src/alt_dev_replacement.c") if(DEFINED CONFIG_BOARD_HEROBRINE_NPCX9) project(herobrine_npcx9) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC - "src/herobrine_npcx9/alt_dev_replacement.c") endif() diff --git a/zephyr/projects/herobrine/src/herobrine_npcx9/alt_dev_replacement.c b/zephyr/projects/herobrine/src/alt_dev_replacement.c index fe3f06fca5..fe3f06fca5 100644 --- a/zephyr/projects/herobrine/src/herobrine_npcx9/alt_dev_replacement.c +++ b/zephyr/projects/herobrine/src/alt_dev_replacement.c |