diff options
| -rw-r--r-- | zephyr/projects/herobrine/BUILD.py | 37 | ||||
| -rw-r--r-- | zephyr/projects/herobrine/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | zephyr/projects/herobrine/prj_herobrine_npcx9.conf | 6 |
3 files changed, 11 insertions, 37 deletions
diff --git a/zephyr/projects/herobrine/BUILD.py b/zephyr/projects/herobrine/BUILD.py index 3a3a952ddf..f5daa3c9b6 100644 --- a/zephyr/projects/herobrine/BUILD.py +++ b/zephyr/projects/herobrine/BUILD.py @@ -2,32 +2,15 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - -def register_variant(project_name, extra_dts_overlays=(), extra_kconfig_files=()): - register_npcx_project( - project_name=project_name, - zephyr_board="herobrine_npcx9", - dts_overlays=[ - # Common to all projects. - here / "battery.dts", - here / "gpio.dts", - here / "i2c.dts", - here / "motionsense.dts", - here / "switchcap.dts", - here / "usbc.dts", - # Project-specific DTS customization. - *extra_dts_overlays, - ], - kconfig_files=[ - # Common to all projects. - here / "prj.conf", - # Project-specific KConfig customization. - *extra_kconfig_files, - ], - ) - - -register_variant( +register_npcx_project( project_name="herobrine_npcx9", - extra_kconfig_files=[here / "prj_herobrine_npcx9.conf"], + zephyr_board="herobrine_npcx9", + dts_overlays=[ + "gpio.dts", + "battery.dts", + "i2c.dts", + "motionsense.dts", + "switchcap.dts", + "usbc.dts", + ], ) diff --git a/zephyr/projects/herobrine/CMakeLists.txt b/zephyr/projects/herobrine/CMakeLists.txt index 6782d8e4ed..9b21ee77bd 100644 --- a/zephyr/projects/herobrine/CMakeLists.txt +++ b/zephyr/projects/herobrine/CMakeLists.txt @@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.13.1) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) +project(herobrine_npcx9) zephyr_library_include_directories(include) @@ -18,7 +19,3 @@ 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) -endif() diff --git a/zephyr/projects/herobrine/prj_herobrine_npcx9.conf b/zephyr/projects/herobrine/prj_herobrine_npcx9.conf deleted file mode 100644 index 1b13f58a2e..0000000000 --- a/zephyr/projects/herobrine/prj_herobrine_npcx9.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2022 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Herobrine-NPCX9 reference-board-specific Kconfig settings. -CONFIG_BOARD_HEROBRINE_NPCX9=y |