zephyr: move all the boards directories under zephyr/boards

Move all the boards directories together under zephyr/boards from
their scattered locations under projects/.

This is the first step towards de-coupling the concept of a Zephyr
board from baseboard/board/model, as it currently is.  Further work
will be required to actually unify these directories and delete the
baseboard-specific names from our tree.

BUG=b:193814903
BRANCH=none
TEST=zmake testall

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I33a344af6890b2c2c54f1e91f0f0fa85caaf19d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3035222
Commit-Queue: Yuval Peress <peress@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>

5 files changed, 0 insertions, 331 deletions

diff --git a/zephyr/projects/asurada/boards/riscv/asurada/Kconfig.board b/zephyr/projects/asurada/boards/riscv/asurada/Kconfig.board
deleted file mode 100644
index f17a00d2fd..0000000000
--- a/zephyr/projects/asurada/boards/riscv/asurada/Kconfig.board
+++ /dev/null
@@ -1,14 +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.
-
-# "BOARD" below refers to a Zephyr board, which does not have a 1:1
-# mapping with the Chrome OS concept of a board.  By Zephyr's
-# conventions, we'll still call it "BOARD_*" to make this more
-# applicable to be upstreamed, even though this code is shared by all
-# projects using Trogdor baseboard.
-config BOARD_ASURADA
-	bool "Google Asurada Baseboard"
-	depends on SOC_IT8XXX2
-	# Allow generating initial 0 line coverage.
-	select HAS_COVERAGE_SUPPORT
diff --git a/zephyr/projects/asurada/boards/riscv/asurada/Kconfig.defconfig b/zephyr/projects/asurada/boards/riscv/asurada/Kconfig.defconfig
deleted file mode 100644
index 8732b9cc39..0000000000
--- a/zephyr/projects/asurada/boards/riscv/asurada/Kconfig.defconfig
+++ /dev/null
@@ -1,28 +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_ASURADA
-
-config BOARD
-	default "asurada"
-
-config TASK_PD_STACK_SIZE
-	default 1280
-
-config TASK_CHARGER_STACK_SIZE
-	default 1280
-
-config TASK_KEYSCAN_STACK_SIZE
-	default 1280
-
-config TASK_MOTIONSENSE_STACK_SIZE
-	default 1536
-
-config TASK_HOSTCMD_STACK_SIZE
-	default 1280
-
-config SYSTEM_WORKQUEUE_STACK_SIZE
-	default 1536
-
-endif # BOARD_ASURADA
diff --git a/zephyr/projects/asurada/boards/riscv/asurada/asurada.dts b/zephyr/projects/asurada/boards/riscv/asurada/asurada.dts
deleted file mode 100644
index f5c4cc3cfe..0000000000
--- a/zephyr/projects/asurada/boards/riscv/asurada/asurada.dts
+++ /dev/null
@@ -1,182 +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/ite/it8xxx2.dtsi>
-#include <dt-bindings/adc/adc.h>
-#include <dt-bindings/gpio_defines.h>
-#include <it8xxx2.dtsi>
-
-/ {
-	model = "Google Asurada Baseboard";
-
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,console = &uart1;
-		zephyr,shell-uart = &uart1;
-		zephyr,flash = &flash0;
-		zephyr,flash-controller = &flashctrl;
-	};
-
-	named-adc-channels {
-		compatible = "named-adc-channels";
-
-		adc_vbus_c0 {
-			label = "ADC_VBUS_C0";
-			enum-name = "ADC_VBUS_C0";
-			channel = <0>;
-			mul = <10>;
-		};
-		adc_board_id0 {
-			label = "ADC_BOARD_ID_0";
-			enum-name = "ADC_BOARD_ID_0";
-			channel = <1>;
-		};
-		adc_board_id1 {
-			label = "ADC_BOARD_ID_1";
-			enum-name = "ADC_BOARD_ID_1";
-			channel = <2>;
-		};
-		adc_charger_amon_r {
-			label = "ADC_AMON_BMON";
-			enum-name = "ADC_AMON_BMON";
-			channel = <3>;
-			mul = <1000>;
-			div = <18>;
-		};
-		adc_vbus_c1 {
-			label = "ADC_VBUS_C1";
-			enum-name = "ADC_VBUS_C1";
-			channel = <5>;
-			mul = <10>;
-		};
-		adc_charger_pmon {
-			label = "ADC_PMON";
-			enum-name = "ADC_PMON";
-			channel = <6>;
-		};
-		adc-psys {
-			label = "ADC_PSYS";
-			enum-name = "ADC_PSYS";
-			channel = <6>;
-		};
-	};
-
-	named-i2c-ports {
-		compatible = "named-i2c-ports";
-
-		power {
-			i2c-port = <&i2c0>;
-			enum-name = "I2C_PORT_POWER";
-			label = "POWER";
-		};
-		battery {
-			i2c-port = <&i2c0>;
-			remote-port = <0>;
-			enum-name = "I2C_PORT_BATTERY";
-			label = "BATTERY";
-		};
-		eeprom {
-			i2c-port = <&i2c0>;
-			enum-name = "I2C_PORT_EEPROM";
-			label = "EEPROM";
-		};
-		charger {
-			i2c-port = <&i2c0>;
-			enum-name = "I2C_PORT_CHARGER";
-			label = "CHARGER";
-		};
-		i2c_sensor: sensor {
-			i2c-port = <&i2c1>;
-			enum-name = "I2C_PORT_SENSOR";
-			label = "SENSOR";
-		};
-		i2c-accel {
-			i2c-port = <&i2c1>;
-			enum-name = "I2C_PORT_ACCEL";
-			label = "ACCEL";
-		};
-		ppc0 {
-			i2c-port = <&i2c2>;
-			enum-name = "I2C_PORT_PPC0";
-			label = "PPC0";
-		};
-		ppc1 {
-			i2c-port = <&i2c4>;
-			enum-name = "I2C_PORT_PPC1";
-			label = "PPC1";
-		};
-		usb-c0 {
-			i2c-port = <&i2c2>;
-			enum-name = "I2C_PORT_USB_C0";
-			label = "USB_C0";
-		};
-		usb-c1 {
-			i2c-port = <&i2c4>;
-			enum-name = "I2C_PORT_USB_C1";
-			label = "USB_C1";
-		};
-		usb-mux0 {
-			i2c-port = <&i2c2>;
-			enum-name = "I2C_PORT_USB_MUX0";
-			label = "USB_MUX0";
-		};
-		usb-mux1 {
-			i2c-port = <&i2c4>;
-			enum-name = "I2C_PORT_USB_MUX1";
-			label = "USB_MUX1";
-		};
-	};
-
-	soc {
-		cros_kb_raw: cros-kb-raw@f01d00 {
-			compatible = "ite,it8xxx2-cros-kb-raw";
-			reg = <0x00f01d00 0x29>;
-			label = "CROS_KB_RAW_0";
-			interrupt-parent = <&intc>;
-			interrupts = <13 IRQ_TYPE_LEVEL_HIGH>;
-			status = "disabled";
-		};
-	};
-};
-
-&uart1 {
-	status = "okay";
-	current-speed = <115200>;
-	clock-frequency = <1804800>;
-};
-
-&adc0 {
-	status = "okay";
-};
-
-&i2c0 {
-	/* EC_I2C_PWR_CBI */
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-};
-
-&i2c1 {
-	/* EC_I2C_SENSOR */
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c2 {
-	/* EC_I2C_USB_C0 */
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c4{
-	/* EC_I2C_USB_C1 */
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&cros_kb_raw {
-	status = "okay";
-};
diff --git a/zephyr/projects/asurada/boards/riscv/asurada/asurada_defconfig b/zephyr/projects/asurada/boards/riscv/asurada/asurada_defconfig
deleted file mode 100644
index f75a366ea4..0000000000
--- a/zephyr/projects/asurada/boards/riscv/asurada/asurada_defconfig
+++ /dev/null
@@ -1,105 +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_RISCV32_IT8XXX2=y
-
-# Platform Configuration
-CONFIG_SOC_IT8XXX2=y
-CONFIG_BOARD_ASURADA=y
-
-# SoC configuration
-CONFIG_AP=y
-CONFIG_AP_ARM_MTK_MT8192=y
-CONFIG_HAS_TASK_CHIPSET=y
-
-# Console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_UART_NS16550=y
-CONFIG_SHELL_TAB=y
-CONFIG_SHELL_TAB_AUTOCOMPLETION=y
-CONFIG_SHELL_HISTORY=y
-
-# GPIO Controller
-CONFIG_GPIO=y
-CONFIG_GPIO_ITE_IT8XXX2=y
-
-# ADC Driver
-CONFIG_ADC_ITE_IT8XXX2=y
-CONFIG_PLATFORM_EC_ADC=y
-CONFIG_PLATFORM_EC_ADC_RESOLUTION=10
-
-# Clock configuration
-CONFIG_CLOCK_CONTROL=y
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32768
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=32768
-
-# Flash
-CONFIG_PLATFORM_EC_CONSOLE_CMD_FLASH=y
-CONFIG_PLATFORM_EC_FLASH_CROS=y
-CONFIG_SOC_FLASH_ITE_IT8XXX2=y
-
-# I2C
-CONFIG_I2C_ITE_IT8XXX2=y
-CONFIG_PLATFORM_EC_I2C=y
-
-# Keyboard
-CONFIG_PLATFORM_EC_KEYBOARD=y
-CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y
-
-# Lid Switch
-CONFIG_PLATFORM_EC_LID_SWITCH=y
-
-# MKBP
-CONFIG_PLATFORM_EC_MKBP_EVENT=y
-CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y
-CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y
-CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y
-
-# Pinmux Driver
-CONFIG_PINMUX=y
-CONFIG_PINMUX_ITE_IT8XXX2=y
-
-# Power Button
-CONFIG_PLATFORM_EC_POWER_BUTTON=y
-
-# Power Sequencing
-CONFIG_PLATFORM_EC_POWERSEQ=y
-CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y
-CONFIG_PLATFORM_EC_POWERSEQ_IT8XXX2=y
-CONFIG_PLATFORM_EC_POWERSEQ_PP5000_CONTROL=n
-CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
-CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y
-
-# PWM
-CONFIG_PWM=y
-CONFIG_PWM_SHELL=n
-CONFIG_PLATFORM_EC_PWM=y
-CONFIG_PWM_ITE_IT8XXX2=y
-
-# Serial Drivers
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-
-# Serial Host Interface (SHI) device.
-CONFIG_CROS_SHI_IT8XXX2=y
-
-# Timer configuration
-CONFIG_ITE_IT8XXX2_TIMER=y
-
-# WATCHDOG configuration
-CONFIG_WATCHDOG=y
-CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS=500
-
-# Code RAM base for IT8XXX2
-CONFIG_CROS_EC_PROGRAM_MEMORY_BASE=0x80000000
-CONFIG_CROS_EC_RAM_BASE=0x80100000
-CONFIG_CROS_EC_DATA_RAM_SIZE=0x00100000
-CONFIG_CROS_EC_RAM_SIZE=0x0000f000
-
-CONFIG_CROS_EC_RO_MEM_OFF=0x0
-CONFIG_CROS_EC_RO_SIZE=0x40000
-CONFIG_CROS_EC_RW_MEM_OFF=0x40000
-CONFIG_CROS_EC_RW_SIZE=0x40000
diff --git a/zephyr/projects/asurada/hayato/CMakeLists.txt b/zephyr/projects/asurada/hayato/CMakeLists.txt
index 54dd0bfafb..f82b2be970 100644
--- a/zephyr/projects/asurada/hayato/CMakeLists.txt
+++ b/zephyr/projects/asurada/hayato/CMakeLists.txt
@@ -5,8 +5,6 @@
 cmake_minimum_required(VERSION 3.13.1)
 add_compile_definitions(BOARD_HAYATO)
 
-set(BOARD_ROOT "${CMAKE_CURRENT_LIST_DIR}/..")
-
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hayato)