herobrine: Deprecate herobrine_npcx9 board and use npcx9 instead

The herobrine_npcx9 board is now the same as the common npcx
board. Change the herobrine project to use the npcx9 instead of
the herobrine_npcx9. Remove the herobrine_npcx9 board directory.

BRANCH=None
BUG=b:214613810
TEST=Built the herobrine_npcx9 project and checked generated
source.dts and kconfig.conf unchanged.

Change-Id: I449122d017cc8a06af68c6cea6a4eb260edcfa15
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3400547
Reviewed-by: Sam Hurst <shurst@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>

4 files changed, 0 insertions, 128 deletions

diff --git a/zephyr/boards/arm/herobrine_npcx9/Kconfig.board b/zephyr/boards/arm/herobrine_npcx9/Kconfig.board
deleted file mode 100644
index d9e7faf3af..0000000000
--- a/zephyr/boards/arm/herobrine_npcx9/Kconfig.board
+++ /dev/null
@@ -1,15 +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 Herobrine-NPCX9 baseboard.
-config BOARD_HEROBRINE_NPCX9
-	bool "Google Herobrine-NPCX9 Baseboard"
-	depends on SOC_NPCX9M3F
-	# NPCX doesn't actually have enough ram for coverage, but this will
-	# allow generating initial 0 line coverage.
-	select HAS_COVERAGE_SUPPORT
diff --git a/zephyr/boards/arm/herobrine_npcx9/Kconfig.defconfig b/zephyr/boards/arm/herobrine_npcx9/Kconfig.defconfig
deleted file mode 100644
index 65f3225d91..0000000000
--- a/zephyr/boards/arm/herobrine_npcx9/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_HEROBRINE_NPCX9
-
-config BOARD
-	default "herobrine_npcx9"
-
-endif # BOARD_HEROBRINE_NPCX9
diff --git a/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9.dts b/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9.dts
deleted file mode 100644
index d2ea7a2975..0000000000
--- a/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9.dts
+++ /dev/null
@@ -1,55 +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/npcx9.dtsi>
-#include <dt-bindings/gpio_defines.h>
-#include <dt-bindings/wake_mask_event_defines.h>
-#include <nuvoton/npcx9m3f.dtsi>
-
-/ {
-	model = "Google Herobrine-NPCX9 Baseboard";
-
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,console = &uart1;
-		zephyr,shell-uart = &uart1;
-		zephyr,flash = &flash0;
-		zephyr,flash-controller = &int_flash;
-	};
-};
-
-&uart1 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&altj_cr_sin1_sl2 &altj_cr_sout1_sl2>;
-};
-
-&cros_kb_raw {
-	status = "okay";
-	/* No KSO2 (it's inverted and implemented by GPIO) */
-	pinctrl-0 = <&alt7_no_ksi0_sl
-		     &alt7_no_ksi1_sl
-		     &alt7_no_ksi2_sl
-		     &alt7_no_ksi3_sl
-		     &alt7_no_ksi4_sl
-		     &alt7_no_ksi5_sl
-		     &alt7_no_ksi6_sl
-		     &alt7_no_ksi7_sl
-		     &alt8_no_kso00_sl
-		     &alt8_no_kso01_sl
-		     &alt8_no_kso03_sl
-		     &alt8_no_kso04_sl
-		     &alt8_no_kso05_sl
-		     &alt8_no_kso06_sl
-		     &alt8_no_kso07_sl
-		     &alt9_no_kso08_sl
-		     &alt9_no_kso09_sl
-		     &alt9_no_kso10_sl
-		     &alt9_no_kso11_sl
-		     &alt9_no_kso12_sl
-		     >;
-};
diff --git a/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9_defconfig b/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9_defconfig
deleted file mode 100644
index 609a8312f1..0000000000
--- a/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9_defconfig
+++ /dev/null
@@ -1,48 +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_NPCX9=y
-CONFIG_SOC_NPCX9M3F=y
-
-# Platform Configuration
-CONFIG_BOARD_HEROBRINE_NPCX9=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
-
-# WATCHDOG configuration
-CONFIG_WATCHDOG=y
-
-# Power Management
-CONFIG_SOC_POWER_MANAGEMENT=y
-CONFIG_PM_POLICY_APP=y
-CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
-CONFIG_SOC_POWER_MANAGEMENT_TRACE=y
-
-# BBRAM
-CONFIG_BBRAM=y
-CONFIG_BBRAM_NPCX=y
-
-# SPI
-CONFIG_SPI=y
-
-# Flash
-CONFIG_FLASH=y
-CONFIG_SPI_NOR=y
-CONFIG_FLASH_JESD216_API=y