diff options
author | Julius Werner <jwerner@chromium.org> | 2018-08-08 14:20:00 -0700 |
---|---|---|
committer | Julius Werner <jwerner@chromium.org> | 2018-08-10 04:15:32 +0000 |
commit | 3b1987b6befedc5a7e1fc614d7ba24a554fb06b1 (patch) | |
tree | cdb46a916bd4a5ba4323415413f4f5dc9db8c5d9 | |
parent | 042b53ad65da38caed1584e0547afbf2e78b6fe0 (diff) |
google: Remove board 'rotor'
Rotor is dead, long live [PROJECT NAME REDACTED]!
Change-Id: Ia9308944257255e077a44c1df262c7f49c69890c
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/27964
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r-- | src/mainboard/google/rotor/Kconfig | 48 | ||||
-rw-r--r-- | src/mainboard/google/rotor/Kconfig.name | 2 | ||||
-rw-r--r-- | src/mainboard/google/rotor/Makefile.inc | 29 | ||||
-rw-r--r-- | src/mainboard/google/rotor/board.h | 28 | ||||
-rw-r--r-- | src/mainboard/google/rotor/board_info.txt | 3 | ||||
-rw-r--r-- | src/mainboard/google/rotor/bootblock.c | 54 | ||||
-rw-r--r-- | src/mainboard/google/rotor/chromeos.c | 34 | ||||
-rw-r--r-- | src/mainboard/google/rotor/chromeos.fmd | 27 | ||||
-rw-r--r-- | src/mainboard/google/rotor/devicetree.cb | 18 | ||||
-rw-r--r-- | src/mainboard/google/rotor/dram_params.c | 245 | ||||
-rw-r--r-- | src/mainboard/google/rotor/mainboard.c | 31 | ||||
-rw-r--r-- | src/mainboard/google/rotor/memlayout.ld | 16 | ||||
-rw-r--r-- | src/mainboard/google/rotor/reset.c | 22 |
13 files changed, 0 insertions, 557 deletions
diff --git a/src/mainboard/google/rotor/Kconfig b/src/mainboard/google/rotor/Kconfig deleted file mode 100644 index 437fa02c18..0000000000 --- a/src/mainboard/google/rotor/Kconfig +++ /dev/null @@ -1,48 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2016 Marvell, 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_ROTOR - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - select SOC_MARVELL_MVMAP2315 - select MAINBOARD_HAS_CHROMEOS - select BOARD_ROMSIZE_KB_4096 - -config VBOOT - select VBOOT_MOCK_SECDATA - -config MAINBOARD_DIR - string - default google/rotor - -config MAINBOARD_PART_NUMBER - string - default "rotor" - -config GBB_HWID - string - depends on CHROMEOS - default "ROTOR TEST 1234" - -config VBOOT_FWID_MODEL - string - default "Marvell_Rotor" - -config DRAM_SIZE_MB - int - default 232 - -endif # BOARD_MARVELL_ROTOR diff --git a/src/mainboard/google/rotor/Kconfig.name b/src/mainboard/google/rotor/Kconfig.name deleted file mode 100644 index 710c2dd3b2..0000000000 --- a/src/mainboard/google/rotor/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_GOOGLE_ROTOR - bool "Rotor" diff --git a/src/mainboard/google/rotor/Makefile.inc b/src/mainboard/google/rotor/Makefile.inc deleted file mode 100644 index f2fa3e161d..0000000000 --- a/src/mainboard/google/rotor/Makefile.inc +++ /dev/null @@ -1,29 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2016 Marvell, 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 += memlayout.ld -bootblock-y += reset.c -bootblock-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-y += mainboard.c -ramstage-y += memlayout.ld -ramstage-y += reset.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -romstage-y += memlayout.ld -romstage-y += reset.c -romstage-y += dram_params.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/google/rotor/board.h b/src/mainboard/google/rotor/board.h deleted file mode 100644 index 726317266b..0000000000 --- a/src/mainboard/google/rotor/board.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Marvell, 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. - */ - -#ifndef __COREBOOT_SRC_MAINBOARD_GOOGLE_ROTOR_BOARD_H -#define __COREBOOT_SRC_MAINBOARD_GOOGLE_ROTOR_BOARD_H - -#include <stdint.h> - -#include <soc/pinmux.h> - -#define PINMUX_APB_UART0_TXD PINMUX(165, 1, 1, 0, 0, PULLUP) -#define PINMUX_APB_UART0_RXD PINMUX(166, 1, 1, 0, 0, PULLUP) -#define PINMUX_APB_UART1_TXD PINMUX(176, 1, 1, 0, 0, PULLUP) -#define PINMUX_APB_UART1_RXD PINMUX(177, 1, 1, 0, 0, PULLUP) - -#endif /* __COREBOOT_SRC_MAINBOARD_GOOGLE_ROTOR_BOARD_H */ diff --git a/src/mainboard/google/rotor/board_info.txt b/src/mainboard/google/rotor/board_info.txt deleted file mode 100644 index 27011b2e1c..0000000000 --- a/src/mainboard/google/rotor/board_info.txt +++ /dev/null @@ -1,3 +0,0 @@ -Category: laptop -ROM protocol: parallel flash -Flashrom support: y diff --git a/src/mainboard/google/rotor/bootblock.c b/src/mainboard/google/rotor/bootblock.c deleted file mode 100644 index aa47677c66..0000000000 --- a/src/mainboard/google/rotor/bootblock.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Marvell, 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 <stddef.h> -#include <stdint.h> -#include <stdlib.h> - -#include <arch/io.h> -#include <bootblock_common.h> -#include <console/console.h> -#include <soc/clock.h> -#include <soc/pinmux.h> - -#include "board.h" - -struct mvmap2315_pinmux board_pinmux[] = { - PINMUX_APB_UART0_TXD, - PINMUX_APB_UART0_RXD, - PINMUX_APB_UART1_TXD, - PINMUX_APB_UART1_RXD, -}; - -static void pinmux_init(void) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(board_pinmux); i++) - set_pinmux(board_pinmux[i]); -} - -void bootblock_mainboard_early_init(void) -{ - /* enable APB/UART0 clock */ - setbits_le32(&mvmap2315_apmu_clk->uartclk0_clkgenconfig, - MVMAP2315_UART_CLK_EN); - - /* enable APB/UART1 clock */ - setbits_le32(&mvmap2315_apmu_clk->uartclk1_clkgenconfig, - MVMAP2315_UART_CLK_EN); - - pinmux_init(); -} diff --git a/src/mainboard/google/rotor/chromeos.c b/src/mainboard/google/rotor/chromeos.c deleted file mode 100644 index c73fe47d15..0000000000 --- a/src/mainboard/google/rotor/chromeos.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Marvell, 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 <boot/coreboot_tables.h> -#include <bootmode.h> - -#include "board.h" - -void fill_lb_gpios(struct lb_gpios *gpios) -{ - /*TODO: implement fill_lb_gpios */ -} - -int get_recovery_mode_switch(void) -{ - return 0; -} - -int get_write_protect_state(void) -{ - return 0; -} diff --git a/src/mainboard/google/rotor/chromeos.fmd b/src/mainboard/google/rotor/chromeos.fmd deleted file mode 100644 index f4a2819f7b..0000000000 --- a/src/mainboard/google/rotor/chromeos.fmd +++ /dev/null @@ -1,27 +0,0 @@ -FLASH@0x0 0x400000 { - WP_RO@0x0 0x200000 { - RO_SECTION@0x0 0x1f0000 { - BOOTBLOCK@0 128K - COREBOOT(CBFS)@0x20000 0xe0000 - FMAP@0x100000 0x1000 - GBB@0x101000 0xeef00 - RO_FRID@0x1eff00 0x100 - } - RO_VPD@0x1f0000 0x10000 - } - RW_SECTION_A@0x200000 0x78000 { - VBLOCK_A@0x0 0x2000 - FW_MAIN_A(CBFS)@0x2000 0x75f00 - RW_FWID_A@0x77f00 0x100 - } - RW_SHARED@0x278000 0x4000 { - SHARED_DATA@0x0 0x4000 - } - RW_ELOG@0x27c000 0x4000 - RW_SECTION_B@0x280000 0x78000 { - VBLOCK_B@0x0 0x2000 - FW_MAIN_B(CBFS)@0x2000 0x75f00 - RW_FWID_B@0x77f00 0x100 - } - RW_VPD@0x2f8000 0x8000 -} diff --git a/src/mainboard/google/rotor/devicetree.cb b/src/mainboard/google/rotor/devicetree.cb deleted file mode 100644 index e2eccf0dce..0000000000 --- a/src/mainboard/google/rotor/devicetree.cb +++ /dev/null @@ -1,18 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2016 Marvell, 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. -## - -chip soc/marvell/mvmap2315 - device cpu_cluster 0 on end -end diff --git a/src/mainboard/google/rotor/dram_params.c b/src/mainboard/google/rotor/dram_params.c deleted file mode 100644 index 60a417b6c9..0000000000 --- a/src/mainboard/google/rotor/dram_params.c +++ /dev/null @@ -1,245 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Marvell, 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 <soc/sdram.h> - -struct mvmap2315_sdram_params ddr_params = { - { - 0x1f1f1f1f, - 0x00000100, - 0x00000100, - 0x1f1f1f1f, - 0x00000100, - 0x00000100, - 0x1f1f1f1f, - 0x00000100, - 0x00000100, - 0x1f1f1f1f, - 0x00000100, - 0x00000100, - 0x00010100, - 0x00000100, - 0x00003100, - 0x00010100, - 0x00000100, - 0x00003100, - 0x00010100, - 0x00000100, - 0x00003100, - 0x00010100, - 0x00000100, - 0x00003100, - 0x03230080, - 0x03230081, - 0x03230085, - 0x03230081, - 0x03230080, - 0x03230081, - 0x03230085, - 0x03230081, - 0x03230080, - 0x03230081, - 0x03230085, - 0x03230081, - 0x03230080, - 0x03230081, - 0x03230085, - 0x03230081, - 0x000b0681, - 0x000b0681, - 0x2A1001B8, - 0x2A1001B8, - 0x8000bb04, - 0x8000bb04, - 0x88087700, - 0x88087700, - 0x000b0681, - 0x000b0681, - 0x2A1001B8, - 0x2A1001B8, - 0x8000bb04, - 0x8000bb04, - 0x88087700, - 0x88087700, - 0x000b0681, - 0x000b0681, - 0x2A1001B8, - 0x2A1001B8, - 0x8000bb04, - 0x8000bb04, - 0x88087700, - 0x88087700, - 0x000b0681, - 0x000b0681, - 0x2A1001B8, - 0x2A1001B8, - 0x8000bb04, - 0x8000bb04, - 0x88087700, - 0x88087700, - 0x00bb0000, - 0x00bb0000, - 0x00bb0000, - 0x00bb0000, - 0x00bb0000, - 0x00bb0000, - 0x00bb0000, - 0x00bb0000, - 0x00000508, - 0x2A1001B8, - 0x00000508, - 0x00010508, - 0x00010508, - 0x00000508, - 0x2A1001B8, - 0x00000508, - 0x00010508, - 0x00010508, - 0x00000508, - 0x2A1001B8, - 0x00000508, - 0x00010508, - 0x00010508, - 0x00000508, - 0x2A1001B8, - 0x00000508, - 0x00010508, - 0x00010508 - }, - { - 0x04020632, - 0x04020632, - 0x04020632, - 0x04020632, - 0x04020632, - 0x04020632, - 0x04020632, - 0x04020632, - 0x00000010, - 0x00000010, - 0x00000010, - 0x00000010, - 0x00100000, - 0x00100000, - 0x00100000, - 0x00100000, - 0x00100000, - 0x00100000, - 0x00100000, - 0x00100000, - 0x00000000, - 0x00100001, - 0x00000000, - 0x40100001, - 0x00000000, - 0x80100003, - 0x00000000, - 0xc0100001, - 0x00000001, - 0x00100001, - 0x00000001, - 0x40100001, - 0x00000001, - 0x80100003, - 0x00000001, - 0xc0100001, - 0x221d0c1d, - 0x221d0c1d, - 0x221d0c1d, - 0x221d0c1d, - 0x40601d44, - 0x40601d44, - 0x40601d44, - 0x40601d44, - 0x10001000, - 0x10001000, - 0x10001000, - 0x10001000, - 0x00011000, - 0x00011000, - 0x00011000, - 0x00011000, - 0x0000020a, - 0x0000020a, - 0x0000020a, - 0x0000020a, - 0x0000027e, - 0x0004de19, - 0x0c7600a5, - 0x0000027e, - 0x0004de19, - 0x0c7600a5, - 0x0000027e, - 0x0004de19, - 0x0c7600a5, - 0x0000027e, - 0x0004de19, - 0x0c7600a5, - 0x02020404, - 0x02020404, - 0x02020404, - 0x02020404, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000004, - 0x00000004, - 0x00000004, - 0x00000004, - 0x0060003d, - 0x0060003d, - 0x0060003d, - 0x0060003d, - 0x00e000e0, - 0x00e000e0, - 0x00e000e0, - 0x00e000e0, - 0x010c0c08, - 0x010c0c08, - 0x010c0c08, - 0x010c0c08, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000e1c, - 0x00000e1c, - 0x00000e1c, - 0x00000e1c, - 0x0005a200, - 0x000000b0, - 0x000000b0, - 0x000000b0, - 0x000000b0, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x16000c00, - 0x16000c00, - 0x16000c00, - 0x16000c00, - 0x00000ff1, - 0xf3000001, - 0xf3020001, - 0xf3020002, - 0xf302000d - }, -}; diff --git a/src/mainboard/google/rotor/mainboard.c b/src/mainboard/google/rotor/mainboard.c deleted file mode 100644 index 63867bbd34..0000000000 --- a/src/mainboard/google/rotor/mainboard.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Marvell, 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 <device/device.h> - -static void mainboard_init(struct device *dev) -{ - /* TODO: implement mainboard_init */ -} - -static void mainboard_enable(struct device *dev) -{ - dev->ops->init = &mainboard_init; -} - -struct chip_operations mainboard_ops = { - .name = "rotor", - .enable_dev = mainboard_enable, -}; diff --git a/src/mainboard/google/rotor/memlayout.ld b/src/mainboard/google/rotor/memlayout.ld deleted file mode 100644 index 05a44968c1..0000000000 --- a/src/mainboard/google/rotor/memlayout.ld +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Marvell, 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 <soc/memlayout.ld> diff --git a/src/mainboard/google/rotor/reset.c b/src/mainboard/google/rotor/reset.c deleted file mode 100644 index fc97f2df68..0000000000 --- a/src/mainboard/google/rotor/reset.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Marvell, 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 <reset.h> -#include <soc/reset.h> - -void do_hard_reset(void) -{ - mvmap2315_reset(); -} |