21 files changed, 33 insertions, 34 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 = {
diff --git a/src/soc/imgtec/Kconfig b/src/soc/imgtec/Kconfig
index 4364a94102..df51850f70 100644
--- a/src/soc/imgtec/Kconfig
+++ b/src/soc/imgtec/Kconfig
@@ -1 +1 @@
-source src/soc/imgtec/danube/Kconfig
+source src/soc/imgtec/pistachio/Kconfig
diff --git a/src/soc/imgtec/Makefile.inc b/src/soc/imgtec/Makefile.inc
index 06ce1d29e2..60a99091a1 100644
--- a/src/soc/imgtec/Makefile.inc
+++ b/src/soc/imgtec/Makefile.inc
@@ -1 +1 @@
-subdirs-$(CONFIG_CPU_IMGTEC_DANUBE) += danube
+subdirs-$(CONFIG_CPU_IMGTEC_PISTACHIO) += pistachio
diff --git a/src/soc/imgtec/danube/Kconfig b/src/soc/imgtec/pistachio/Kconfig
index b41d267ed4..1acfe39a8c 100644
--- a/src/soc/imgtec/danube/Kconfig
+++ b/src/soc/imgtec/pistachio/Kconfig
@@ -19,7 +19,7 @@
 # MA 02110-1301 USA
 #
 
-config CPU_IMGTEC_DANUBE
+config CPU_IMGTEC_PISTACHIO
 	select CPU_MIPS
 	select DYNAMIC_CBMEM
 	select GENERIC_UDELAY
@@ -28,11 +28,11 @@ config CPU_IMGTEC_DANUBE
 	select HAVE_UART_SPECIAL
 	bool
 
-if CPU_IMGTEC_DANUBE
+if CPU_IMGTEC_PISTACHIO
 
 config BOOTBLOCK_CPU_INIT
 	string
-	default "soc/imgtec/danube/bootblock.c"
+	default "soc/imgtec/pistachio/bootblock.c"
 
 config BOOTBLOCK_BASE
 	hex
diff --git a/src/soc/imgtec/danube/Makefile.inc b/src/soc/imgtec/pistachio/Makefile.inc
index 266084839e..1d5e0c2b16 100644
--- a/src/soc/imgtec/danube/Makefile.inc
+++ b/src/soc/imgtec/pistachio/Makefile.inc
@@ -19,7 +19,7 @@
 # MA 02110-1301 USA
 #
 
-# We enable CBFS_SPI_WRAPPER for Danuibe targets.
+# We enable CBFS_SPI_WRAPPER for Pistachio targets.
 bootblock-y += spi.c
 romstage-y += spi.c
 ramstage-y += spi.c
diff --git a/src/soc/imgtec/danube/bootblock.c b/src/soc/imgtec/pistachio/bootblock.c
index f6cc76b0b9..f6cc76b0b9 100644
--- a/src/soc/imgtec/danube/bootblock.c
+++ b/src/soc/imgtec/pistachio/bootblock.c
diff --git a/src/soc/imgtec/danube/cbmem.c b/src/soc/imgtec/pistachio/cbmem.c
index 5fb6c0e7bd..5fb6c0e7bd 100644
--- a/src/soc/imgtec/danube/cbmem.c
+++ b/src/soc/imgtec/pistachio/cbmem.c
diff --git a/src/soc/imgtec/danube/monotonic_timer.c b/src/soc/imgtec/pistachio/monotonic_timer.c
index a8fe27c9cc..a8fe27c9cc 100644
--- a/src/soc/imgtec/danube/monotonic_timer.c
+++ b/src/soc/imgtec/pistachio/monotonic_timer.c
diff --git a/src/soc/imgtec/danube/romstage.c b/src/soc/imgtec/pistachio/romstage.c
index 53ca898fed..53ca898fed 100644
--- a/src/soc/imgtec/danube/romstage.c
+++ b/src/soc/imgtec/pistachio/romstage.c
diff --git a/src/soc/imgtec/danube/spi.c b/src/soc/imgtec/pistachio/spi.c
index 95bf8272a8..95bf8272a8 100644
--- a/src/soc/imgtec/danube/spi.c
+++ b/src/soc/imgtec/pistachio/spi.c
diff --git a/src/soc/imgtec/danube/timestamp.c b/src/soc/imgtec/pistachio/timestamp.c
index f0dc5ad9cb..f0dc5ad9cb 100644
--- a/src/soc/imgtec/danube/timestamp.c
+++ b/src/soc/imgtec/pistachio/timestamp.c
diff --git a/src/soc/imgtec/danube/uart.c b/src/soc/imgtec/pistachio/uart.c
index 855fce5847..53bf21d226 100644
--- a/src/soc/imgtec/danube/uart.c
+++ b/src/soc/imgtec/pistachio/uart.c
@@ -142,7 +142,7 @@ static unsigned int uart_baudrate_divisor(unsigned int baudrate,
 	return (1 + (2 * refclk) / (baudrate * oversample)) / 2;
 }
 
-static void danube_uart_init(void)
+static void pistachio_uart_init(void)
 {
 	u32 base = uart_platform_base(0);
 	if (!base)
@@ -154,7 +154,7 @@ static void danube_uart_init(void)
 	uart8250_mem_init(base, div);
 }
 
-static void danube_uart_tx_byte(unsigned char data)
+static void pistachio_uart_tx_byte(unsigned char data)
 {
 	u32 base = uart_platform_base(0);
 	if (!base)
@@ -162,7 +162,7 @@ static void danube_uart_tx_byte(unsigned char data)
 	uart8250_mem_tx_byte(base, data);
 }
 
-static unsigned char danube_uart_rx_byte(void)
+static unsigned char pistachio_uart_rx_byte(void)
 {
 	u32 base = uart_platform_base(0);
 	if (!base)
@@ -170,7 +170,7 @@ static unsigned char danube_uart_rx_byte(void)
 	return uart8250_mem_rx_byte(base);
 }
 
-static void danube_uart_tx_flush(void)
+static void pistachio_uart_tx_flush(void)
 {
 	u32 base = uart_platform_base(0);
 	if (!base)
@@ -180,11 +180,11 @@ static void danube_uart_tx_flush(void)
 
 #if !defined(__PRE_RAM__)
 
-static const struct console_driver danube_uart_console __console = {
-	.init     = danube_uart_init,
-	.tx_byte  = danube_uart_tx_byte,
-	.tx_flush = danube_uart_tx_flush,
-	.rx_byte  = danube_uart_rx_byte,
+static const struct console_driver pistachio_uart_console __console = {
+	.init     = pistachio_uart_init,
+	.tx_byte  = pistachio_uart_tx_byte,
+	.tx_flush = pistachio_uart_tx_flush,
+	.rx_byte  = pistachio_uart_rx_byte,
 };
 
 uint32_t uartmem_getbaseaddr(void)
@@ -196,22 +196,22 @@ uint32_t uartmem_getbaseaddr(void)
 
 void uart_init(void)
 {
-	danube_uart_init();
+	pistachio_uart_init();
 }
 
 void uart_tx_byte(unsigned char data)
 {
-	danube_uart_tx_byte(data);
+	pistachio_uart_tx_byte(data);
 }
 
 unsigned char uart_rx_byte(void)
 {
-	return danube_uart_rx_byte();
+	return pistachio_uart_rx_byte();
 }
 
 void uart_tx_flush(void)
 {
-	danube_uart_tx_flush();
+	pistachio_uart_tx_flush();
 }
 
 #endif /* __PRE_RAM__ */