From 2d510d01d1eb45af0f8ba2b060748c465243c099 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Mon, 29 Sep 2014 12:43:40 -0700 Subject: 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 Original-Commit-Id: 58696cc7c77a70dca2bfd512d695d143e1097a78 Original-Change-Id: Ie5ede401c4f69ed5d832a9eabac008eeac6db62d Original-Signed-off-by: Vadim Bendebury Original-Reviewed-on: https://chromium-review.googlesource.com/220401 Original-Reviewed-by: Andrew Bresticker Reviewed-on: http://review.coreboot.org/9048 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/emulation/Kconfig | 7 ++- src/mainboard/emulation/imgvp-danube/Kconfig | 53 ---------------------- src/mainboard/emulation/imgvp-danube/Makefile.inc | 22 --------- src/mainboard/emulation/imgvp-danube/bootblock.c | 24 ---------- src/mainboard/emulation/imgvp-danube/devicetree.cb | 26 ----------- src/mainboard/emulation/imgvp-danube/mainboard.c | 33 -------------- src/mainboard/emulation/imgvp-danube/romstage.c | 38 ---------------- src/mainboard/emulation/imgvp-pistachio/Kconfig | 53 ++++++++++++++++++++++ .../emulation/imgvp-pistachio/Makefile.inc | 22 +++++++++ .../emulation/imgvp-pistachio/bootblock.c | 24 ++++++++++ .../emulation/imgvp-pistachio/devicetree.cb | 26 +++++++++++ .../emulation/imgvp-pistachio/mainboard.c | 33 ++++++++++++++ src/mainboard/emulation/imgvp-pistachio/romstage.c | 38 ++++++++++++++++ src/mainboard/google/urara/Kconfig | 4 +- src/mainboard/google/urara/devicetree.cb | 2 +- src/mainboard/google/urara/mainboard.c | 2 +- 16 files changed, 203 insertions(+), 204 deletions(-) delete mode 100644 src/mainboard/emulation/imgvp-danube/Kconfig delete mode 100644 src/mainboard/emulation/imgvp-danube/Makefile.inc delete mode 100644 src/mainboard/emulation/imgvp-danube/bootblock.c delete mode 100644 src/mainboard/emulation/imgvp-danube/devicetree.cb delete mode 100644 src/mainboard/emulation/imgvp-danube/mainboard.c delete mode 100644 src/mainboard/emulation/imgvp-danube/romstage.c create mode 100644 src/mainboard/emulation/imgvp-pistachio/Kconfig create mode 100644 src/mainboard/emulation/imgvp-pistachio/Makefile.inc create mode 100644 src/mainboard/emulation/imgvp-pistachio/bootblock.c create mode 100644 src/mainboard/emulation/imgvp-pistachio/devicetree.cb create mode 100644 src/mainboard/emulation/imgvp-pistachio/mainboard.c create mode 100644 src/mainboard/emulation/imgvp-pistachio/romstage.c (limited to 'src/mainboard') 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-danube/Kconfig deleted file mode 100644 index 07897f756a..0000000000 --- a/src/mainboard/emulation/imgvp-danube/Kconfig +++ /dev/null @@ -1,53 +0,0 @@ -# -# This file is part of the coreboot project. -# -# Copyright (C) 2014 Imagination Technologies -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2 of -# the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301 USA -# - -if BOARD_EMULATION_IMGVP_DANUBE - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOOTBLOCK_CONSOLE - select CPU_IMGTEC_DANUBE - -config MAINBOARD_DIR - string - default emulation/imgvp-danube - -config MAINBOARD_PART_NUMBER - string - default "ImgTec Danube Virtual Platform" - -config BOOTBLOCK_MAINBOARD_INIT - string - default "mainboard/emulation/imgvp-danube/bootblock.c" - -config SYS_SDRAM_BASE - hex "SDRAM base address" - default 0x80000000 - -config DRAM_SIZE_MB - int - default 256 - -config HEAP_SIZE - hex - default 0x08000000 - -endif diff --git a/src/mainboard/emulation/imgvp-danube/Makefile.inc b/src/mainboard/emulation/imgvp-danube/Makefile.inc deleted file mode 100644 index 8be1b22946..0000000000 --- a/src/mainboard/emulation/imgvp-danube/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -# -# This file is part of the coreboot project. -# -# Copyright 2014 Imagination Technologies Ltd. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2 of -# the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301 USA -# - -romstage-y += romstage.c diff --git a/src/mainboard/emulation/imgvp-danube/bootblock.c b/src/mainboard/emulation/imgvp-danube/bootblock.c deleted file mode 100644 index 1784a02f44..0000000000 --- a/src/mainboard/emulation/imgvp-danube/bootblock.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Imagination Technologies - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -void bootblock_mainboard_init(void) -{ -} diff --git a/src/mainboard/emulation/imgvp-danube/devicetree.cb b/src/mainboard/emulation/imgvp-danube/devicetree.cb deleted file mode 100644 index 6e9849ea85..0000000000 --- a/src/mainboard/emulation/imgvp-danube/devicetree.cb +++ /dev/null @@ -1,26 +0,0 @@ -# -# This file is part of the coreboot project. -# -# Copyright (C) 2014 Imagination Technologies -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2 of -# the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301 USA -# - -chip soc/imgtec/danube - chip drivers/generic/generic # I2C0 controller - device i2c 6 on end # Fake component for testing - end -end diff --git a/src/mainboard/emulation/imgvp-danube/mainboard.c b/src/mainboard/emulation/imgvp-danube/mainboard.c deleted file mode 100644 index a3e27039a0..0000000000 --- a/src/mainboard/emulation/imgvp-danube/mainboard.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Imagination Technologies - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include -#include - -static void mainboard_enable(device_t dev) -{ - printk(BIOS_INFO, "Enable imgvp-danube device...\n"); -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, -}; - diff --git a/src/mainboard/emulation/imgvp-danube/romstage.c b/src/mainboard/emulation/imgvp-danube/romstage.c deleted file mode 100644 index ac0ea5f903..0000000000 --- a/src/mainboard/emulation/imgvp-danube/romstage.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Imagination Technologies - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include -#include -#include -#include - -void main(void) -{ - void *entry; - - console_init(); - - entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage"); - if (entry != (void *)-1) - stage_exit(entry); - - hlt(); -} diff --git a/src/mainboard/emulation/imgvp-pistachio/Kconfig b/src/mainboard/emulation/imgvp-pistachio/Kconfig new file mode 100644 index 0000000000..068528e6d6 --- /dev/null +++ b/src/mainboard/emulation/imgvp-pistachio/Kconfig @@ -0,0 +1,53 @@ +# +# This file is part of the coreboot project. +# +# Copyright (C) 2014 Imagination Technologies +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 of +# the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +if BOARD_EMULATION_IMGVP_PISTACHIO + +config BOARD_SPECIFIC_OPTIONS + def_bool y + select BOOTBLOCK_CONSOLE + select CPU_IMGTEC_PISTACHIO + +config MAINBOARD_DIR + string + default emulation/imgvp-pistachio + +config MAINBOARD_PART_NUMBER + string + default "ImgTec Pistachio Virtual Platform" + +config BOOTBLOCK_MAINBOARD_INIT + string + default "mainboard/emulation/imgvp-pistachio/bootblock.c" + +config SYS_SDRAM_BASE + hex "SDRAM base address" + default 0x80000000 + +config DRAM_SIZE_MB + int + default 256 + +config HEAP_SIZE + hex + default 0x08000000 + +endif diff --git a/src/mainboard/emulation/imgvp-pistachio/Makefile.inc b/src/mainboard/emulation/imgvp-pistachio/Makefile.inc new file mode 100644 index 0000000000..8be1b22946 --- /dev/null +++ b/src/mainboard/emulation/imgvp-pistachio/Makefile.inc @@ -0,0 +1,22 @@ +# +# This file is part of the coreboot project. +# +# Copyright 2014 Imagination Technologies Ltd. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 of +# the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +romstage-y += romstage.c diff --git a/src/mainboard/emulation/imgvp-pistachio/bootblock.c b/src/mainboard/emulation/imgvp-pistachio/bootblock.c new file mode 100644 index 0000000000..1784a02f44 --- /dev/null +++ b/src/mainboard/emulation/imgvp-pistachio/bootblock.c @@ -0,0 +1,24 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Imagination Technologies + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +void bootblock_mainboard_init(void) +{ +} diff --git a/src/mainboard/emulation/imgvp-pistachio/devicetree.cb b/src/mainboard/emulation/imgvp-pistachio/devicetree.cb new file mode 100644 index 0000000000..a328b9d1cf --- /dev/null +++ b/src/mainboard/emulation/imgvp-pistachio/devicetree.cb @@ -0,0 +1,26 @@ +# +# This file is part of the coreboot project. +# +# Copyright (C) 2014 Imagination Technologies +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 of +# the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +chip soc/imgtec/pistachio + chip drivers/generic/generic # I2C0 controller + device i2c 6 on end # Fake component for testing + end +end diff --git a/src/mainboard/emulation/imgvp-pistachio/mainboard.c b/src/mainboard/emulation/imgvp-pistachio/mainboard.c new file mode 100644 index 0000000000..fdae940c6f --- /dev/null +++ b/src/mainboard/emulation/imgvp-pistachio/mainboard.c @@ -0,0 +1,33 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Imagination Technologies + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include +#include + +static void mainboard_enable(device_t dev) +{ + printk(BIOS_INFO, "Enable imgvp-pistachio device...\n"); +} + +struct chip_operations mainboard_ops = { + .enable_dev = mainboard_enable, +}; + diff --git a/src/mainboard/emulation/imgvp-pistachio/romstage.c b/src/mainboard/emulation/imgvp-pistachio/romstage.c new file mode 100644 index 0000000000..ac0ea5f903 --- /dev/null +++ b/src/mainboard/emulation/imgvp-pistachio/romstage.c @@ -0,0 +1,38 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Imagination Technologies + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include +#include +#include +#include + +void main(void) +{ + void *entry; + + console_init(); + + entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage"); + if (entry != (void *)-1) + stage_exit(entry); + + hlt(); +} 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 = { -- cgit v1.2.3