summaryrefslogtreecommitdiff
path: root/zephyr/projects/volteer
diff options
context:
space:
mode:
Diffstat (limited to 'zephyr/projects/volteer')
-rw-r--r--zephyr/projects/volteer/delbin/CMakeLists.txt2
-rw-r--r--zephyr/projects/volteer/delbin/boards/arm/delbin/Kconfig.board7
-rw-r--r--zephyr/projects/volteer/delbin/boards/arm/delbin/Kconfig.defconfig10
-rw-r--r--zephyr/projects/volteer/delbin/boards/arm/delbin/board.cmake5
-rw-r--r--zephyr/projects/volteer/delbin/boards/arm/delbin/delbin.dts147
-rw-r--r--zephyr/projects/volteer/delbin/boards/arm/delbin/delbin.yaml17
-rw-r--r--zephyr/projects/volteer/delbin/boards/arm/delbin/delbin_defconfig56
-rw-r--r--zephyr/projects/volteer/delbin/zmake.yaml2
8 files changed, 3 insertions, 243 deletions
diff --git a/zephyr/projects/volteer/delbin/CMakeLists.txt b/zephyr/projects/volteer/delbin/CMakeLists.txt
index 0303ee7c62..f08356ecf2 100644
--- a/zephyr/projects/volteer/delbin/CMakeLists.txt
+++ b/zephyr/projects/volteer/delbin/CMakeLists.txt
@@ -4,6 +4,8 @@
cmake_minimum_required(VERSION 3.13.1)
+set(BOARD_ROOT "${CMAKE_CURRENT_LIST_DIR}/..")
+
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(delbin)
diff --git a/zephyr/projects/volteer/delbin/boards/arm/delbin/Kconfig.board b/zephyr/projects/volteer/delbin/boards/arm/delbin/Kconfig.board
deleted file mode 100644
index 612127c0d0..0000000000
--- a/zephyr/projects/volteer/delbin/boards/arm/delbin/Kconfig.board
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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.
-
-config BOARD_DELBIN
- bool "Google Delbin EC"
- depends on SOC_NPCX7M6FB # Actually NPCX7M6FC; C has 512K Flash
diff --git a/zephyr/projects/volteer/delbin/boards/arm/delbin/Kconfig.defconfig b/zephyr/projects/volteer/delbin/boards/arm/delbin/Kconfig.defconfig
deleted file mode 100644
index 3b5e04a219..0000000000
--- a/zephyr/projects/volteer/delbin/boards/arm/delbin/Kconfig.defconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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.
-
-if BOARD_DELBIN
-
-config BOARD
- default "delbin"
-
-endif # BOARD_DELBIN
diff --git a/zephyr/projects/volteer/delbin/boards/arm/delbin/board.cmake b/zephyr/projects/volteer/delbin/boards/arm/delbin/board.cmake
deleted file mode 100644
index 5c02f2707f..0000000000
--- a/zephyr/projects/volteer/delbin/boards/arm/delbin/board.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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.
-
-set(ECST_CHIP_ARG npcx7m7)
diff --git a/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin.dts b/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin.dts
deleted file mode 100644
index d7356ee85d..0000000000
--- a/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin.dts
+++ /dev/null
@@ -1,147 +0,0 @@
-/* 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.
- */
-
-/dts-v1/;
-
-#include <cros/nuvoton/npcx.dtsi>
-#include <dt-bindings/gpio_defines.h>
-#include <nuvoton/npcx7m6fb.dtsi>
-
-/ {
- model = "Google Delbin EC";
-
- aliases {
- i2c-0 = &i2c0_0;
- i2c-1 = &i2c1_0;
- i2c-2 = &i2c2_0;
- i2c-3 = &i2c3_0;
- i2c-5 = &i2c5_0;
- i2c-7 = &i2c7_0;
- };
-
- chosen {
- zephyr,sram = &sram0;
- zephyr,console = &uart1;
- zephyr,shell-uart = &uart1;
- zephyr,flash = &flash0;
- };
-
- named-i2c-ports {
- compatible = "named-i2c-ports";
-
- sensor {
- i2c-port = <&i2c0_0>;
- label = "SENSOR";
- };
- usb-c0 {
- i2c-port = <&i2c1_0>;
- label = "USB_C0";
- };
- usb-c1 {
- i2c-port = <&i2c2_0>;
- label = "USB_C1";
- };
- usb1-mix {
- i2c-port = <&i2c3_0>;
- label = "USB_1_MIX";
- };
- power {
- i2c-port = <&i2c5_0>;
- label = "POWER";
- };
- eeprom {
- i2c-port = <&i2c7_0>;
- label = "EEPROM";
- };
- };
-
- soc {
- cros_kb_raw: cros-kb-raw@400a3000 {
- compatible = "nuvoton,npcx-cros-kb-raw";
- reg = <0x400a3000 0x2000>;
- label = "CROS_KB_RAW_0";
- interrupts = <49 0>;
- clocks = <&pcc NPCX_CLOCK_BUS_APB1 NPCX_PWDWN_CTL1 0>;
- /* No KSO2 (it's inverted and implemented by GPIO.) */
- pinctrl-0 = <&alt7_no_ksi0_sl /* KSI0 PIN31 */
- &alt7_no_ksi1_sl /* KSI1 PIN30 */
- &alt7_no_ksi2_sl /* KSI2 PIN27 */
- &alt7_no_ksi3_sl /* KSI3 PIN26 */
- &alt7_no_ksi4_sl /* KSI4 PIN25 */
- &alt7_no_ksi5_sl /* KSI5 PIN24 */
- &alt7_no_ksi6_sl /* KSI6 PIN23 */
- &alt7_no_ksi7_sl /* KSI7 PIN22 */
- &alt8_no_kso00_sl /* KSO00 PIN21 */
- &alt8_no_kso01_sl /* KSO01 PIN20 */
- &alt8_no_kso03_sl /* KSO03 PIN16 */
- &alt8_no_kso04_sl /* KSO04 PIN15 */
- &alt8_no_kso05_sl /* KSO05 PIN14 */
- &alt8_no_kso06_sl /* KSO06 PIN13 */
- &alt8_no_kso07_sl /* KSO07 PIN12 */
- &alt9_no_kso08_sl /* KSO08 PIN11 */
- &alt9_no_kso09_sl /* KSO09 PIN10 */
- &alt9_no_kso10_sl /* KSO10 PIN07 */
- &alt9_no_kso11_sl /* KSO11 PIN06 */
- &alt9_no_kso12_sl /* KSO12 PIN05 */
- &alt9_no_kso13_sl /* KSO13 PIN04 */
- &alt9_no_kso14_sl /* KSO14 PIN82 */
- >;
- wui_maps = <&wui_io31 &wui_io30 &wui_io27 &wui_io26
- &wui_io25 &wui_io24 &wui_io23 &wui_io22>;
- status = "disabled";
- };
-
- fiu0: cros-flash@40020000 {
- compatible = "nuvoton,npcx-cros-flash";
- reg = <0x40020000 0x2000>;
- clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL1 2>;
- size = <0x80000>;
- label = "FLASH_INTERFACE_UNIT0";
- pinctrl-0 = <>;
- };
- };
-
- /* Update flash size to 512KB from 196KB since we are using C variant */
- /delete-node/ flash@10090000;
- flash0: flash@10070000 {
- reg = <0x10070000 0x40000>;
- };
-};
-
-&uart1 {
- status = "okay";
- current-speed = <115200>;
- pinctrl-0 = <&altc_uart1_sl2>; /* Use UART1_SL2 ie. PIN64.65 */
-};
-
-&i2c0_0 {
- status = "okay";
- clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c1_0 {
- status = "okay";
- clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-};
-
-&i2c2_0 {
- status = "okay";
- clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-};
-
-&i2c3_0 {
- status = "okay";
- clock-frequency = <I2C_BITRATE_STANDARD>;
-};
-
-&i2c5_0 {
- status = "okay";
- clock-frequency = <I2C_BITRATE_STANDARD>;
-};
-
-&i2c7_0 {
- status = "okay";
- clock-frequency = <I2C_BITRATE_FAST>;
-};
diff --git a/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin.yaml b/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin.yaml
deleted file mode 100644
index 17d4bc734e..0000000000
--- a/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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.
-
-identifier: delbin
-name: "Google Delbin Embedded Controller"
-type: mcu
-arch: arm
-toolchain:
- - zephyr
- - gnuarmemb
-ram: 64
-flash: 512
-testing:
- ignore_tags:
- - net
- - bluetooth
diff --git a/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin_defconfig b/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin_defconfig
deleted file mode 100644
index 09409aa4e3..0000000000
--- a/zephyr/projects/volteer/delbin/boards/arm/delbin/delbin_defconfig
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.
-
-# Zephyr Kernel Configuration
-CONFIG_SOC_SERIES_NPCX7=y
-
-# Platform Configuration
-CONFIG_SOC_NPCX7M6FB=y # Actually NPCX7M6FC; C just has 512K Flash
-CONFIG_BOARD_DELBIN=y
-
-# NPCX BootLoader Table Configuration
-CONFIG_PLATFORM_EC_RO_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO_2=y
-CONFIG_PLATFORM_EC_RO_HEADER_SPI_MAX_CLOCK_50=y
-CONFIG_PLATFORM_EC_RO_HEADER_SPI_READ_MODE_DUAL=y
-
-# Serial Drivers
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Pinmux Driver
-CONFIG_PINMUX=y
-
-# GPIO Controller
-CONFIG_GPIO=y
-
-# Clock configuration
-CONFIG_CLOCK_CONTROL=y
-
-# PLL configuration
-CONFIG_CLOCK_NPCX_OSC_CYCLES_PER_SEC=90000000
-CONFIG_CLOCK_NPCX_APB1_PRESCALER=6
-CONFIG_CLOCK_NPCX_APB2_PRESCALER=6
-CONFIG_CLOCK_NPCX_APB3_PRESCALER=6
-
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=15000000
-
-# Code RAM base for NPCX797FC
-CONFIG_CROS_EC_PROGRAM_MEMORY_BASE=0x10070000
-CONFIG_CROS_EC_RAM_BASE=0x200c0000
-CONFIG_CROS_EC_DATA_RAM_SIZE=0x00010000
-CONFIG_CROS_EC_RAM_SIZE=0x0000f800
-
-CONFIG_FLASH_SIZE=512
-CONFIG_CROS_EC_RO_MEM_OFF=0x0
-# (44*1024)
-CONFIG_CROS_EC_RO_SIZE=0x40000
-# (CONFIG_CROS_EC_RO_MEM_OFF + CONFIG_CROS_EC_RO_SIZE)
-CONFIG_CROS_EC_RW_MEM_OFF=0x0
-# (CONFIG_CROS_EC_FLASH_SIZE - CONFIG_CROS_EC_RW_MEM_OFF -
-# CONFIG_CROS_EC_RO_MEM_OFF)
-CONFIG_CROS_EC_RW_SIZE=0x40000
diff --git a/zephyr/projects/volteer/delbin/zmake.yaml b/zephyr/projects/volteer/delbin/zmake.yaml
index 2a0ac25f16..c72b16c1fb 100644
--- a/zephyr/projects/volteer/delbin/zmake.yaml
+++ b/zephyr/projects/volteer/delbin/zmake.yaml
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-board: delbin
+board: volteer
dts-overlays:
- gpio.dts
supported-zephyr-versions: