diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2014-09-29 12:43:40 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-03-27 08:06:26 +0100 |
| commit | 2d510d01d1eb45af0f8ba2b060748c465243c099 (patch) | |
| tree | 322b53b4e113f9ea2980efce10ec803b36fae63f /src/mainboard/emulation | |
| parent | ab0f710af735ecf2a8f8ca2dd1d3eeb16b54b818 (diff) | |
urara: use proper SOC name
Danube has become Pistachio, let's rename all instances where this SOC
is mentioned.
BUG=none
TEST=board urara still builds
Change-Id: Iea91419121eb6ab5665c2f9f95e82f461905268e
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 58696cc7c77a70dca2bfd512d695d143e1097a78
Original-Change-Id: Ie5ede401c4f69ed5d832a9eabac008eeac6db62d
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/220401
Original-Reviewed-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-on: http://review.coreboot.org/9048
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/emulation')
| -rw-r--r-- | src/mainboard/emulation/Kconfig | 7 | ||||
| -rw-r--r-- | src/mainboard/emulation/imgvp-pistachio/Kconfig (renamed from src/mainboard/emulation/imgvp-danube/Kconfig) | 10 | ||||
| -rw-r--r-- | src/mainboard/emulation/imgvp-pistachio/Makefile.inc (renamed from src/mainboard/emulation/imgvp-danube/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/mainboard/emulation/imgvp-pistachio/bootblock.c (renamed from src/mainboard/emulation/imgvp-danube/bootblock.c) | 0 | ||||
| -rw-r--r-- | src/mainboard/emulation/imgvp-pistachio/devicetree.cb (renamed from src/mainboard/emulation/imgvp-danube/devicetree.cb) | 2 | ||||
| -rw-r--r-- | src/mainboard/emulation/imgvp-pistachio/mainboard.c (renamed from src/mainboard/emulation/imgvp-danube/mainboard.c) | 2 | ||||
| -rw-r--r-- | src/mainboard/emulation/imgvp-pistachio/romstage.c (renamed from src/mainboard/emulation/imgvp-danube/romstage.c) | 0 |
7 files changed, 10 insertions, 11 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 |