5 files changed, 9 insertions, 9 deletions
diff --git a/zephyr/boards/riscv/corsola/Kconfig.board b/zephyr/boards/riscv/it8xxx2/Kconfig.board
index 5760247df4..0e58c236f8 100644
--- a/zephyr/boards/riscv/corsola/Kconfig.board
+++ b/zephyr/boards/riscv/it8xxx2/Kconfig.board
@@ -7,8 +7,8 @@
 # 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_CORSOLA
-	bool "Google Corsola Baseboard"
+config BOARD_IT8XXX2
+	bool "IT8XXX2 Zephyr Board"
 	depends on SOC_IT8XXX2
 	# Allow generating initial 0 line coverage.
 	select HAS_COVERAGE_SUPPORT
diff --git a/zephyr/boards/riscv/corsola/Kconfig.defconfig b/zephyr/boards/riscv/it8xxx2/Kconfig.defconfig
index bec25afa54..e8d116d65a 100644
--- a/zephyr/boards/riscv/corsola/Kconfig.defconfig
+++ b/zephyr/boards/riscv/it8xxx2/Kconfig.defconfig
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-if BOARD_CORSOLA
+if BOARD_IT8XXX2
 
 config BOARD
-	default "corsola"
+	default "it8xxx2"
 
 # Zephyr internal stack sizes
 
@@ -53,4 +53,4 @@ choice PLATFORM_EC_HOSTCMD_DEBUG_MODE
 	default HCDEBUG_OFF
 endchoice # PLATFORM_EC_HOSTCMD_DEBUG_MODE
 
-endif # BOARD_CORSOLA
+endif # BOARD_IT8XXX2
diff --git a/zephyr/boards/riscv/corsola/corsola.dts b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts
index 8a03035550..bf6f7a52d3 100644
--- a/zephyr/boards/riscv/corsola/corsola.dts
+++ b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts
@@ -12,7 +12,7 @@
 #include <dt-bindings/wake_mask_event_defines.h>
 
 / {
-	model = "Google Corsola Baseboard";
+	model = "Google IT8XXX2 Baseboard";
 
 	chosen {
 		zephyr,sram = &sram0;
diff --git a/zephyr/boards/riscv/corsola/corsola_defconfig b/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig
index 6dd0b3674b..2cb3650a7f 100644
--- a/zephyr/boards/riscv/corsola/corsola_defconfig
+++ b/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig
@@ -4,10 +4,10 @@
 
 # Zephyr Kernel Configuration
 CONFIG_SOC_SERIES_RISCV32_IT8XXX2=y
+CONFIG_SOC_IT8XXX2=y
 
 # Platform Configuration
-CONFIG_SOC_IT8XXX2=y
-CONFIG_BOARD_CORSOLA=y
+CONFIG_BOARD_IT8XXX2=y
 
 # SoC configuration
 CONFIG_AP=y
diff --git a/zephyr/projects/corsola/krabby/zmake.yaml b/zephyr/projects/corsola/krabby/zmake.yaml
index 29c1599f9d..c31e34eccb 100644
--- a/zephyr/projects/corsola/krabby/zmake.yaml
+++ b/zephyr/projects/corsola/krabby/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: corsola
+board: it8xxx2
 dts-overlays:
   - battery.dts
   - gpio.dts