diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-01-14 16:51:03 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-15 03:57:14 +0000 |
| commit | f5a9932e2daeb697d401c1907860c89ee27e26df (patch) | |
| tree | ec29100a79751ddb1f757fa3900a98b0130f5273 | |
| parent | 128f2f23eacd2c88605292b14750e241ae2551c9 (diff) | |
| download | chrome-ec-f5a9932e2daeb697d401c1907860c89ee27e26df.tar.gz | |
zephyr: zmake: drop zephyr-chrome from DTS_ROOT
Needed to clear file conflicts.
BUG=b:177003034
BRANCH=none
TEST=zmake testall
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I7ac8ed94f9bef4e834293cf5c011b3a52d862770
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2631346
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index 653962040d..dcd2d91a8a 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -91,12 +91,7 @@ class Zmake: base_config = zmake.build_config.BuildConfig( environ_defs={'ZEPHYR_BASE': str(zephyr_base), 'PATH': '/usr/bin'}, - cmake_defs={'DTS_ROOT': '{};{}'.format( - # TODO(b/177003034): remove zephyr-chrome from here - # once all dts files have migrated to platform/ec. - module_paths['zephyr-chrome'], - module_paths['ec-shim'] / 'zephyr', - )}) + cmake_defs={'DTS_ROOT': str(module_paths['ec-shim'] / 'zephyr')}) module_config = zmake.modules.setup_module_symlinks( build_dir / 'modules', module_paths) |