zephyr: volteer: start converting board to baseboard

Start working on converting the Zephyr volteer board to be more
representative of a volteer baseboard.  It's still not ready for use
with delbin yet, as GPIOs and other board-specific configurations will
still need moved.

BUG=b:183643832
BRANCH=none
TEST=build zephyr for volteer

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I86fdd11d2670b40ffed0e44617e999ddf89adc84
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2785219
Reviewed-by: Simon Glass <sjg@chromium.org>

9 files changed, 12 insertions, 30 deletions

diff --git a/zephyr/projects/volteer/boards/arm/volteer/Kconfig.board b/zephyr/projects/volteer/boards/arm/volteer/Kconfig.board
new file mode 100644
index 0000000000..b38f6e4546
--- /dev/null
+++ b/zephyr/projects/volteer/boards/arm/volteer/Kconfig.board
@@ -0,0 +1,10 @@
+# Copyright 2021 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.
+
+# Note: this Zephyr board more closely represents the Chrome OS
+# concept of a baseboard.  Zephyr boards and Chrome OS boards do not
+# have a 1:1 mapping.
+config BOARD_VOLTEER
+	bool "Google Volteer Baseboard"
+	depends on SOC_NPCX7M6FC
diff --git a/zephyr/projects/volteer/volteer/boards/arm/volteer/Kconfig.defconfig b/zephyr/projects/volteer/boards/arm/volteer/Kconfig.defconfig
index 05361962d9..05361962d9 100644
--- a/zephyr/projects/volteer/volteer/boards/arm/volteer/Kconfig.defconfig
+++ b/zephyr/projects/volteer/boards/arm/volteer/Kconfig.defconfig
diff --git a/zephyr/projects/volteer/volteer/boards/arm/volteer/board.cmake b/zephyr/projects/volteer/boards/arm/volteer/board.cmake
index b7a2cdde59..b7a2cdde59 100644
--- a/zephyr/projects/volteer/volteer/boards/arm/volteer/board.cmake
+++ b/zephyr/projects/volteer/boards/arm/volteer/board.cmake
diff --git a/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer.dts b/zephyr/projects/volteer/boards/arm/volteer/volteer.dts
index cfe8de58b7..cfe8de58b7 100644
--- a/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer.dts
+++ b/zephyr/projects/volteer/boards/arm/volteer/volteer.dts
diff --git a/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer_defconfig b/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig
index 9a510308a3..ed84e1a116 100644
--- a/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer_defconfig
+++ b/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig
@@ -4,9 +4,9 @@
 
 # Zephyr Kernel Configuration
 CONFIG_SOC_SERIES_NPCX7=y
+CONFIG_SOC_NPCX7M6FC=y
 
 # Platform Configuration
-CONFIG_SOC_NPCX7M6FB=y # Actually NPCX7M6FC; C just has 512K Flash
 CONFIG_BOARD_VOLTEER=y
 
 # NPCX BootLoader Table Configuration
diff --git a/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer_motionsense.dtsi b/zephyr/projects/volteer/boards/arm/volteer/volteer_motionsense.dtsi
index e22d5571dc..e22d5571dc 100644
--- a/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer_motionsense.dtsi
+++ b/zephyr/projects/volteer/boards/arm/volteer/volteer_motionsense.dtsi
diff --git a/zephyr/projects/volteer/volteer/CMakeLists.txt b/zephyr/projects/volteer/volteer/CMakeLists.txt
index 7c8e8f24fc..03db654157 100644
--- a/zephyr/projects/volteer/volteer/CMakeLists.txt
+++ b/zephyr/projects/volteer/volteer/CMakeLists.txt
@@ -4,8 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cmake_minimum_required(VERSION 3.13.1)
-set(BOARD_ROOT ${CMAKE_CURRENT_LIST_DIR})
-set(BOARD volteer)
+set(BOARD_ROOT "${CMAKE_CURRENT_LIST_DIR}/..")
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(volteer)
diff --git a/zephyr/projects/volteer/volteer/boards/arm/volteer/Kconfig.board b/zephyr/projects/volteer/volteer/boards/arm/volteer/Kconfig.board
deleted file mode 100644
index 8cd06feb38..0000000000
--- a/zephyr/projects/volteer/volteer/boards/arm/volteer/Kconfig.board
+++ /dev/null
@@ -1,8 +0,0 @@
-# Google Volteer EC
-
-# Copyright 2020 The Chromium OS Authors
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_VOLTEER
-	bool "Google Volteer EC"
-	depends on SOC_NPCX7M6FB # Actually NPCX7M6FC; C has 512K Flash
diff --git a/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer.yaml b/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer.yaml
deleted file mode 100644
index 923a2765b5..0000000000
--- a/zephyr/projects/volteer/volteer/boards/arm/volteer/volteer.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (c) 2020 Google LLC.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-identifier: volteer
-name: "Google Volteer Embedded Controller"
-type: mcu
-arch: arm
-toolchain:
-  - zephyr
-  - gnuarmemb
-ram: 64
-flash: 512
-testing:
-  ignore_tags:
-    - net
-    - bluetooth