From 250715eb2ff15503710a7d2187688a7db1b4d22f Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Mon, 22 May 2017 16:28:46 -0500 Subject: soc/marvell/bg4cd: remove cosmos mainboard and bg4cd soc The SoC code was never completed. It's just a skeleton that gets in the way of refactoring other code. Likewise, the mainboard was never completed either. Just remove them both. Change-Id: I8faaa9bb1b90ad2936dcdbaf2882651ebba6630c Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/19823 Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- src/mainboard/google/cosmos/Kconfig | 56 ------------------------------ src/mainboard/google/cosmos/Kconfig.name | 2 -- src/mainboard/google/cosmos/Makefile.inc | 37 -------------------- src/mainboard/google/cosmos/board_info.txt | 5 --- src/mainboard/google/cosmos/boardid.c | 21 ----------- src/mainboard/google/cosmos/bootblock.c | 20 ----------- src/mainboard/google/cosmos/chromeos.c | 31 ----------------- src/mainboard/google/cosmos/chromeos.fmd | 28 --------------- src/mainboard/google/cosmos/devicetree.cb | 19 ---------- src/mainboard/google/cosmos/mainboard.c | 34 ------------------ src/mainboard/google/cosmos/memlayout.ld | 14 -------- src/mainboard/google/cosmos/reset.c | 22 ------------ src/mainboard/google/cosmos/romstage.c | 53 ---------------------------- 13 files changed, 342 deletions(-) delete mode 100644 src/mainboard/google/cosmos/Kconfig delete mode 100644 src/mainboard/google/cosmos/Kconfig.name delete mode 100644 src/mainboard/google/cosmos/Makefile.inc delete mode 100644 src/mainboard/google/cosmos/board_info.txt delete mode 100644 src/mainboard/google/cosmos/boardid.c delete mode 100644 src/mainboard/google/cosmos/bootblock.c delete mode 100644 src/mainboard/google/cosmos/chromeos.c delete mode 100644 src/mainboard/google/cosmos/chromeos.fmd delete mode 100644 src/mainboard/google/cosmos/devicetree.cb delete mode 100644 src/mainboard/google/cosmos/mainboard.c delete mode 100644 src/mainboard/google/cosmos/memlayout.ld delete mode 100644 src/mainboard/google/cosmos/reset.c delete mode 100644 src/mainboard/google/cosmos/romstage.c (limited to 'src/mainboard') diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig deleted file mode 100644 index 3d8d64921c..0000000000 --- a/src/mainboard/google/cosmos/Kconfig +++ /dev/null @@ -1,56 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright 2014 Google Inc. -## -## 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. -## - -if BOARD_GOOGLE_COSMOS - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - select BOARD_ID_AUTO - select BOARD_ROMSIZE_KB_2048 - select COMMON_CBFS_SPI_WRAPPER - select HAVE_HARD_RESET - select MAINBOARD_HAS_CHROMEOS - select SOC_MARVELL_BG4CD - select SPI_FLASH - select SPI_FLASH_SPANSION - -config VBOOT - select VBOOT_VBNV_FLASH - -config MAINBOARD_DIR - string - default google/cosmos - -config MAINBOARD_PART_NUMBER - string - default "Cosmos" - -config MAINBOARD_VENDOR - string - default "Google" - -config BOOT_DEVICE_SPI_FLASH_BUS - int - default 2 - -config DRAM_SIZE_MB - int - default 1024 - -config GBB_HWID - string - depends on CHROMEOS - default "Cosmos TEST 1" -endif # BOARD_GOOGLE_COSMOS diff --git a/src/mainboard/google/cosmos/Kconfig.name b/src/mainboard/google/cosmos/Kconfig.name deleted file mode 100644 index 6dade21948..0000000000 --- a/src/mainboard/google/cosmos/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_GOOGLE_COSMOS - bool "Cosmos" diff --git a/src/mainboard/google/cosmos/Makefile.inc b/src/mainboard/google/cosmos/Makefile.inc deleted file mode 100644 index 12f38bd6cf..0000000000 --- a/src/mainboard/google/cosmos/Makefile.inc +++ /dev/null @@ -1,37 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright 2014 Google Inc. -## -## 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. -## -bootblock-y += bootblock.c -bootblock-y += boardid.c -bootblock-y += chromeos.c -bootblock-y += reset.c - -verstage-y += boardid.c -verstage-y += chromeos.c -verstage-y += reset.c - -romstage-y += boardid.c -romstage-y += chromeos.c -romstage-y += romstage.c -romstage-y += reset.c - -ramstage-y += boardid.c -ramstage-y += chromeos.c -ramstage-y += mainboard.c -ramstage-y += reset.c - -bootblock-y += memlayout.ld -verstage-y += memlayout.ld -romstage-y += memlayout.ld -ramstage-y += memlayout.ld diff --git a/src/mainboard/google/cosmos/board_info.txt b/src/mainboard/google/cosmos/board_info.txt deleted file mode 100644 index 15e52fd040..0000000000 --- a/src/mainboard/google/cosmos/board_info.txt +++ /dev/null @@ -1,5 +0,0 @@ -Vendor name: Google -Board name: Cosmos Marvell BG4CD reference board -Category: eval -ROM protocol: SPI -ROM socketed: n diff --git a/src/mainboard/google/cosmos/boardid.c b/src/mainboard/google/cosmos/boardid.c deleted file mode 100644 index 407f9dc643..0000000000 --- a/src/mainboard/google/cosmos/boardid.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * 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. - */ - -#include - -uint8_t board_id(void) -{ - return -1; -} diff --git a/src/mainboard/google/cosmos/bootblock.c b/src/mainboard/google/cosmos/bootblock.c deleted file mode 100644 index 957e09c159..0000000000 --- a/src/mainboard/google/cosmos/bootblock.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * 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. - */ - -#include - -void bootblock_mainboard_init(void) -{ -} diff --git a/src/mainboard/google/cosmos/chromeos.c b/src/mainboard/google/cosmos/chromeos.c deleted file mode 100644 index d43daa2937..0000000000 --- a/src/mainboard/google/cosmos/chromeos.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * 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. - */ - -#include -#include - -void fill_lb_gpios(struct lb_gpios *gpios) -{ -} - -int get_recovery_mode_switch(void) -{ - return 0; -} - -int get_write_protect_state(void) -{ - return 0; -} diff --git a/src/mainboard/google/cosmos/chromeos.fmd b/src/mainboard/google/cosmos/chromeos.fmd deleted file mode 100644 index 98171690ec..0000000000 --- a/src/mainboard/google/cosmos/chromeos.fmd +++ /dev/null @@ -1,28 +0,0 @@ -FLASH@0x0 0x200000 { - WP_RO@0x0 0x100000 { - RO_SECTION@0x0 0xf0000 { - BOOTBLOCK@0 128K - COREBOOT(CBFS)@0x20000 0x60000 - FMAP@0x80000 0x1000 - GBB@0x81000 0x6ef00 - RO_FRID@0xeff00 0x100 - } - RO_VPD@0xf0000 0x10000 - } - RW_SECTION_A@0x100000 0x68000 { - VBLOCK_A@0x0 0x2000 - FW_MAIN_A(CBFS)@0x2000 0x65f00 - RW_FWID_A@0x67f00 0x100 - } - RW_SHARED@0x168000 0x4000 { - SHARED_DATA@0x0 0x4000 - } - RW_ELOG@0x16c000 0x4000 - RW_SECTION_B@0x180000 0x68000 { - VBLOCK_B@0x0 0x2000 - FW_MAIN_B(CBFS)@0x2000 0x65f00 - RW_FWID_B@0x67f00 0x100 - } - RW_VPD@0x1e8000 0x8000 - RW_NVRAM@0x1f0000 0x10000 -} diff --git a/src/mainboard/google/cosmos/devicetree.cb b/src/mainboard/google/cosmos/devicetree.cb deleted file mode 100644 index 054c113398..0000000000 --- a/src/mainboard/google/cosmos/devicetree.cb +++ /dev/null @@ -1,19 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright 2014 Google Inc. -## -## 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. -## - -# TODO fill with Versatile Express board data in QEMU. -chip soc/marvell/bg4cd - device cpu_cluster 0 on end -end diff --git a/src/mainboard/google/cosmos/mainboard.c b/src/mainboard/google/cosmos/mainboard.c deleted file mode 100644 index 85187d81a0..0000000000 --- a/src/mainboard/google/cosmos/mainboard.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * 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. - */ - -#include -#include - -static void mainboard_init(device_t dev) -{ -} - -static void mainboard_enable(device_t dev) -{ - dev->ops->init = &mainboard_init; -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, -}; - -void lb_board(struct lb_header *header) -{ -} diff --git a/src/mainboard/google/cosmos/memlayout.ld b/src/mainboard/google/cosmos/memlayout.ld deleted file mode 100644 index 2c3330651d..0000000000 --- a/src/mainboard/google/cosmos/memlayout.ld +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * 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. - */ - -#include diff --git a/src/mainboard/google/cosmos/reset.c b/src/mainboard/google/cosmos/reset.c deleted file mode 100644 index e01c7414cc..0000000000 --- a/src/mainboard/google/cosmos/reset.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * 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. - */ - -#include - -void hard_reset(void) -{ - while (1) - ; -} diff --git a/src/mainboard/google/cosmos/romstage.c b/src/mainboard/google/cosmos/romstage.c deleted file mode 100644 index 36ee0f9af2..0000000000 --- a/src/mainboard/google/cosmos/romstage.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "timer.h" - -void main(void) -{ - timestamp_add_now(TS_START_ROMSTAGE); - - console_init(); - - timestamp_add_now(TS_BEFORE_INITRAM); - - sdram_init(); - - timestamp_add_now(TS_AFTER_INITRAM); - - mmu_init(); - mmu_config_range(0, 4096, DCACHE_OFF); - dcache_mmu_enable(); - - cbmem_initialize_empty(); - - run_ramstage(); -} -- cgit v1.2.3