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/soc/marvell/bg4cd/Kconfig | 34 ----------- src/soc/marvell/bg4cd/Makefile.inc | 49 ---------------- src/soc/marvell/bg4cd/bootblock.c | 26 --------- src/soc/marvell/bg4cd/bootblock_asm.S | 54 ------------------ src/soc/marvell/bg4cd/cbmem.c | 22 ------- src/soc/marvell/bg4cd/i2c.c | 26 --------- src/soc/marvell/bg4cd/include/soc/gpio.h | 21 ------- src/soc/marvell/bg4cd/include/soc/i2c.h | 21 ------- src/soc/marvell/bg4cd/include/soc/memlayout.ld | 40 ------------- src/soc/marvell/bg4cd/include/soc/sdram.h | 20 ------- src/soc/marvell/bg4cd/monotonic_timer.c | 21 ------- src/soc/marvell/bg4cd/romstage.S | 79 -------------------------- src/soc/marvell/bg4cd/sdram.c | 22 ------- src/soc/marvell/bg4cd/spi.c | 21 ------- 14 files changed, 456 deletions(-) delete mode 100644 src/soc/marvell/bg4cd/Kconfig delete mode 100644 src/soc/marvell/bg4cd/Makefile.inc delete mode 100644 src/soc/marvell/bg4cd/bootblock.c delete mode 100644 src/soc/marvell/bg4cd/bootblock_asm.S delete mode 100644 src/soc/marvell/bg4cd/cbmem.c delete mode 100644 src/soc/marvell/bg4cd/i2c.c delete mode 100644 src/soc/marvell/bg4cd/include/soc/gpio.h delete mode 100644 src/soc/marvell/bg4cd/include/soc/i2c.h delete mode 100644 src/soc/marvell/bg4cd/include/soc/memlayout.ld delete mode 100644 src/soc/marvell/bg4cd/include/soc/sdram.h delete mode 100644 src/soc/marvell/bg4cd/monotonic_timer.c delete mode 100644 src/soc/marvell/bg4cd/romstage.S delete mode 100644 src/soc/marvell/bg4cd/sdram.c delete mode 100644 src/soc/marvell/bg4cd/spi.c (limited to 'src/soc') diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig deleted file mode 100644 index 6f9b6aab32..0000000000 --- a/src/soc/marvell/bg4cd/Kconfig +++ /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. -## - -config SOC_MARVELL_BG4CD - bool - default n - select ARCH_BOOTBLOCK_ARMV7_M - select BOOTBLOCK_CUSTOM if VBOOT - select ARCH_RAMSTAGE_ARMV7 - select ARCH_ROMSTAGE_ARMV7 - select ARCH_VERSTAGE_ARMV7_M - select BOOTBLOCK_CONSOLE - select GENERIC_UDELAY - select HAVE_MONOTONIC_TIMER - select GENERIC_GPIO_LIB - -if SOC_MARVELL_BG4CD - -config VBOOT - select VBOOT_STARTS_IN_BOOTBLOCK - -endif diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc deleted file mode 100644 index 86aa764f89..0000000000 --- a/src/soc/marvell/bg4cd/Makefile.inc +++ /dev/null @@ -1,49 +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. -## - -ifeq ($(CONFIG_SOC_MARVELL_BG4CD),y) - -bootblock-$(CONFIG_VBOOT) += bootblock_asm.S -bootblock-$(CONFIG_VBOOT) += bootblock.c - -bootblock-y += cbmem.c -bootblock-y += i2c.c -bootblock-y += monotonic_timer.c -bootblock-$(CONFIG_SPI_FLASH) += spi.c - -verstage-y += i2c.c -verstage-y += monotonic_timer.c -verstage-$(CONFIG_SPI_FLASH) += spi.c - -romstage-y += romstage.S -romstage-y += cbmem.c -romstage-y += i2c.c -romstage-y += monotonic_timer.c -romstage-y += sdram.c -romstage-$(CONFIG_SPI_FLASH) += spi.c - -ramstage-y += cbmem.c -ramstage-y += i2c.c -ramstage-y += monotonic_timer.c -ramstage-$(CONFIG_SPI_FLASH) += spi.c - -CPPFLAGS_common += -Isrc/soc/marvell/bg4cd/include/ - -$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - @printf "Generating: $(subst $(obj)/,,$(@))\n" - @mkdir -p $(dir $@) - @mv $< $@ - -endif diff --git a/src/soc/marvell/bg4cd/bootblock.c b/src/soc/marvell/bg4cd/bootblock.c deleted file mode 100644 index fb3dcd2248..0000000000 --- a/src/soc/marvell/bg4cd/bootblock.c +++ /dev/null @@ -1,26 +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 - -void main(void) -{ - console_init(); - timestamp_init(timestamp_get()); - run_romstage(); -} diff --git a/src/soc/marvell/bg4cd/bootblock_asm.S b/src/soc/marvell/bg4cd/bootblock_asm.S deleted file mode 100644 index 73ca46b278..0000000000 --- a/src/soc/marvell/bg4cd/bootblock_asm.S +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#include - -ENTRY(_start) - /* - * Initialize the stack to a known value. This is used to check for - * stack overflow later in the boot process. - */ - ldr r0, =_stack - ldr r1, =_estack - ldr r2, =0xdeadbeef -init_stack_loop: - str r2, [r0] - add r0, #4 - cmp r0, r1 - bne init_stack_loop - -call_verstage: - ldr sp, =_estack /* Set up stack pointer */ - /* - * we don't bl here to preserve lr so that we can return to the caller - * of the bootblock - */ - b main -ENDPROC(_start) diff --git a/src/soc/marvell/bg4cd/cbmem.c b/src/soc/marvell/bg4cd/cbmem.c deleted file mode 100644 index ee8cd16f32..0000000000 --- a/src/soc/marvell/bg4cd/cbmem.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 -#include - -void *cbmem_top(void) -{ - return NULL; -} diff --git a/src/soc/marvell/bg4cd/i2c.c b/src/soc/marvell/bg4cd/i2c.c deleted file mode 100644 index 6d06ee3089..0000000000 --- a/src/soc/marvell/bg4cd/i2c.c +++ /dev/null @@ -1,26 +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 - -int platform_i2c_transfer(unsigned bus, struct i2c_seg *segments, int seg_count) -{ - return 0; -} - -void i2c_init(unsigned int bus, unsigned int hz) -{ -} diff --git a/src/soc/marvell/bg4cd/include/soc/gpio.h b/src/soc/marvell/bg4cd/include/soc/gpio.h deleted file mode 100644 index de1224ff72..0000000000 --- a/src/soc/marvell/bg4cd/include/soc/gpio.h +++ /dev/null @@ -1,21 +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. - */ - -#ifndef __SOC_MARVELL_BG4CD_GPIO_H__ -#define __SOC_MARVELL_BG4CD_GPIO_H__ - -#include - -typedef u32 gpio_t; - -#endif /* __SOC_MARVELL_BG4CD_GPIO_H__ */ diff --git a/src/soc/marvell/bg4cd/include/soc/i2c.h b/src/soc/marvell/bg4cd/include/soc/i2c.h deleted file mode 100644 index e6244ea86d..0000000000 --- a/src/soc/marvell/bg4cd/include/soc/i2c.h +++ /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. - */ - -#ifndef __SOC_MARVELL_BG4CD_I2C_H__ -#define __SOC_MARVELL_BG4CD_I2C_H__ - -void i2c_init(unsigned int bus, unsigned int hz); - -#endif diff --git a/src/soc/marvell/bg4cd/include/soc/memlayout.ld b/src/soc/marvell/bg4cd/include/soc/memlayout.ld deleted file mode 100644 index 83d9bf09a3..0000000000 --- a/src/soc/marvell/bg4cd/include/soc/memlayout.ld +++ /dev/null @@ -1,40 +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 - -SECTIONS -{ - SRAM_START(0x20000) - - BOOTBLOCK(0x20000, 40K) - /* there is no VERSTAGE because it's built into bootblock */ - - PRERAM_CBFS_CACHE(0x2A000, 8K) - STACK(0x2C000, 8K) - VBOOT2_WORK(0x2E000, 16K) - - SRAM_END(0x40000) - - DRAM_START(0x40000) - - RAMSTAGE(0x40000, 128K) - POSTRAM_CBFS_CACHE(0x60000, 1M) - - ROMSTAGE(0xF7A40000, 32K) - TTB(0xF7A48000, 16K) -} diff --git a/src/soc/marvell/bg4cd/include/soc/sdram.h b/src/soc/marvell/bg4cd/include/soc/sdram.h deleted file mode 100644 index 09805601c6..0000000000 --- a/src/soc/marvell/bg4cd/include/soc/sdram.h +++ /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. - */ - -#ifndef __SOC_MARVELL_BG4CD_SDRAM_H__ -#define __SOC_MARVELL_BG4CD_SDRAM_H__ - -void sdram_init(void); -#endif diff --git a/src/soc/marvell/bg4cd/monotonic_timer.c b/src/soc/marvell/bg4cd/monotonic_timer.c deleted file mode 100644 index e8e59393b5..0000000000 --- a/src/soc/marvell/bg4cd/monotonic_timer.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 -#include - -void timer_monotonic_get(struct mono_time *mt) -{ -} diff --git a/src/soc/marvell/bg4cd/romstage.S b/src/soc/marvell/bg4cd/romstage.S deleted file mode 100644 index 73574f2bc4..0000000000 --- a/src/soc/marvell/bg4cd/romstage.S +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#include - -.arm -ENTRY(stage_entry) - /* - * Set the CPU to System mode with IRQ and FIQ disabled. Prefetch/Data - * aborts may happen early and crash before the abort handlers are - * installed, but at least the problem will show up near the code that - * causes it. - */ - msr cpsr_cxf, #0xdf - bl _thumb_start -ENDPROC(stage_entry) - -.thumb -ENTRY(_thumb_start) - bl arm_init_caches - - /* - * From Cortex-A Series Programmer's Guide: - * Only CPU 0 performs initialization. Other CPUs go into WFI - * to do this, first work out which CPU this is - * this code typically is run before any other initialization step - */ - mrc p15, 0, r1, c0, c0, 5 @ Read Multiprocessor Affinity Register - and r1, r1, #0x3 @ Extract CPU ID bits - cmp r1, #0 - bne wait_for_interrupt @ If this is not core0, wait - - /* - * Initialize the stack to a known value. This is used to check for - * stack overflow later in the boot process. - */ - ldr r0, =_stack - ldr r1, =_estack - ldr r2, =0xdeadbeef -init_stack_loop: - str r2, [r0] - add r0, #4 - cmp r0, r1 - bne init_stack_loop - - ldr sp, =_estack /* Set up stack pointer */ - bl main - -wait_for_interrupt: - wfi - mov pc, lr @ back to my caller -ENDPROC(_thumb_start) diff --git a/src/soc/marvell/bg4cd/sdram.c b/src/soc/marvell/bg4cd/sdram.c deleted file mode 100644 index 74c239644d..0000000000 --- a/src/soc/marvell/bg4cd/sdram.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 -#include - -void sdram_init(void) -{ - printk(BIOS_INFO, "Starting SDRAM initialization...\n"); - printk(BIOS_INFO, "Finish SDRAM initialization...\n"); -} diff --git a/src/soc/marvell/bg4cd/spi.c b/src/soc/marvell/bg4cd/spi.c deleted file mode 100644 index 188a6bd483..0000000000 --- a/src/soc/marvell/bg4cd/spi.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 -#include - -int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) -{ - return -1; -} -- cgit v1.2.3