10 files changed, 14 insertions, 15 deletions
diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig
index 2ddb846a8a..d2706faa9e 100644
--- a/src/mainboard/emulation/Kconfig
+++ b/src/mainboard/emulation/Kconfig
@@ -5,7 +5,6 @@ choice
 
 config BOARD_EMULATION_QEMU_X86_I440FX
 	bool "QEMU x86 i440fx/piix4 (aka qemu -M pc)"
-
 config BOARD_EMULATION_QEMU_X86_Q35
 	bool "QEMU x86 q35/ich9 (aka qemu -M q35, since v1.4)"
 
@@ -15,8 +14,8 @@ config BOARD_EMULATION_QEMU_ARMV7
 config BOARD_EMULATION_QEMU_UCB_RISCV
 	bool "QEMU ucb riscv"
 
-config BOARD_EMULATION_IMGVP_DANUBE
-	bool "ImgTec Danube Virtual Platform"
+config BOARD_EMULATION_IMGVP_PISTACHIO
+	bool "ImgTec Pistachio Virtual Platform"
 
 endchoice
 
@@ -29,7 +28,7 @@ source "src/mainboard/emulation/qemu-i440fx/Kconfig"
 source "src/mainboard/emulation/qemu-q35/Kconfig"
 source "src/mainboard/emulation/qemu-armv7/Kconfig"
 source "src/mainboard/emulation/qemu-riscv/Kconfig"
-source "src/mainboard/emulation/imgvp-danube/Kconfig"
+source "src/mainboard/emulation/imgvp-pistachio/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/emulation/imgvp-danube/Kconfig b/src/mainboard/emulation/imgvp-pistachio/Kconfig
index 07897f756a..068528e6d6 100644
--- a/src/mainboard/emulation/imgvp-danube/Kconfig
+++ b/src/mainboard/emulation/imgvp-pistachio/Kconfig
@@ -19,24 +19,24 @@
 # MA 02110-1301 USA
 #
 
-if BOARD_EMULATION_IMGVP_DANUBE
+if BOARD_EMULATION_IMGVP_PISTACHIO
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOOTBLOCK_CONSOLE
-	select CPU_IMGTEC_DANUBE
+	select CPU_IMGTEC_PISTACHIO
 
 config MAINBOARD_DIR
 	string
-	default emulation/imgvp-danube
+	default emulation/imgvp-pistachio
 
 config MAINBOARD_PART_NUMBER
 	string
-	default "ImgTec Danube Virtual Platform"
+	default "ImgTec Pistachio Virtual Platform"
 
 config BOOTBLOCK_MAINBOARD_INIT
 	string
-	default "mainboard/emulation/imgvp-danube/bootblock.c"
+	default "mainboard/emulation/imgvp-pistachio/bootblock.c"
 
 config SYS_SDRAM_BASE
 	hex "SDRAM base address"
diff --git a/src/mainboard/emulation/imgvp-danube/Makefile.inc b/src/mainboard/emulation/imgvp-pistachio/Makefile.inc
index 8be1b22946..8be1b22946 100644
--- a/src/mainboard/emulation/imgvp-danube/Makefile.inc
+++ b/src/mainboard/emulation/imgvp-pistachio/Makefile.inc
diff --git a/src/mainboard/emulation/imgvp-danube/bootblock.c b/src/mainboard/emulation/imgvp-pistachio/bootblock.c
index 1784a02f44..1784a02f44 100644
--- a/src/mainboard/emulation/imgvp-danube/bootblock.c
+++ b/src/mainboard/emulation/imgvp-pistachio/bootblock.c
diff --git a/src/mainboard/emulation/imgvp-danube/devicetree.cb b/src/mainboard/emulation/imgvp-pistachio/devicetree.cb
index 6e9849ea85..a328b9d1cf 100644
--- a/src/mainboard/emulation/imgvp-danube/devicetree.cb
+++ b/src/mainboard/emulation/imgvp-pistachio/devicetree.cb
@@ -19,7 +19,7 @@
 # MA 02110-1301 USA
 #
 
-chip soc/imgtec/danube
+chip soc/imgtec/pistachio
 	chip drivers/generic/generic # I2C0 controller
 		device i2c 6 on end # Fake component for testing
 	end
diff --git a/src/mainboard/emulation/imgvp-danube/mainboard.c b/src/mainboard/emulation/imgvp-pistachio/mainboard.c
index a3e27039a0..fdae940c6f 100644
--- a/src/mainboard/emulation/imgvp-danube/mainboard.c
+++ b/src/mainboard/emulation/imgvp-pistachio/mainboard.c
@@ -24,7 +24,7 @@
 
 static void mainboard_enable(device_t dev)
 {
-	printk(BIOS_INFO, "Enable imgvp-danube device...\n");
+	printk(BIOS_INFO, "Enable imgvp-pistachio device...\n");
 }
 
 struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/emulation/imgvp-danube/romstage.c b/src/mainboard/emulation/imgvp-pistachio/romstage.c
index ac0ea5f903..ac0ea5f903 100644
--- a/src/mainboard/emulation/imgvp-danube/romstage.c
+++ b/src/mainboard/emulation/imgvp-pistachio/romstage.c
diff --git a/src/mainboard/google/urara/Kconfig b/src/mainboard/google/urara/Kconfig
index 67013fa075..231c97e3c2 100644
--- a/src/mainboard/google/urara/Kconfig
+++ b/src/mainboard/google/urara/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOOTBLOCK_CONSOLE
 	select CONFIG_SPI_FLASH_WINBOND
-	select CPU_IMGTEC_DANUBE
+	select CPU_IMGTEC_PISTACHIO
         select COMMON_CBFS_SPI_WRAPPER
         select MAINBOARD_HAS_BOOTBLOCK_INIT
 	select SPI_FLASH
@@ -36,7 +36,7 @@ config MAINBOARD_DIR
 
 config MAINBOARD_PART_NUMBER
 	string
-	default "ImgTec Danube Virtual Platform"
+	default "ImgTec Pistachio Virtual Platform"
 
 config SYS_SDRAM_BASE
 	hex "SDRAM base address"
diff --git a/src/mainboard/google/urara/devicetree.cb b/src/mainboard/google/urara/devicetree.cb
index 6e9849ea85..a328b9d1cf 100644
--- a/src/mainboard/google/urara/devicetree.cb
+++ b/src/mainboard/google/urara/devicetree.cb
@@ -19,7 +19,7 @@
 # MA 02110-1301 USA
 #
 
-chip soc/imgtec/danube
+chip soc/imgtec/pistachio
 	chip drivers/generic/generic # I2C0 controller
 		device i2c 6 on end # Fake component for testing
 	end
diff --git a/src/mainboard/google/urara/mainboard.c b/src/mainboard/google/urara/mainboard.c
index dd9cfa7c27..1909fc861f 100644
--- a/src/mainboard/google/urara/mainboard.c
+++ b/src/mainboard/google/urara/mainboard.c
@@ -24,7 +24,7 @@
 
 static void mainboard_enable(device_t dev)
 {
-	printk(BIOS_INFO, "Enable Danube device...\n");
+	printk(BIOS_INFO, "Enable Pistachio device...\n");
 }
 
 struct chip_operations mainboard_ops = {