7 files changed, 0 insertions, 193 deletions
diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig
index 3cd8ba6b7a..a79269f8f0 100644
--- a/payloads/libpayload/Kconfig
+++ b/payloads/libpayload/Kconfig
@@ -258,11 +258,6 @@ config IPQ40XX_SERIAL_CONSOLE
 	depends on SERIAL_CONSOLE
 	default n
 
-config BG4CD_SERIAL_CONSOLE
-	bool "Serial port driver for Marvell's BG4CD"
-	depends on SERIAL_CONSOLE
-	default n
-
 config PL011_SERIAL_CONSOLE
 	bool "PL011 compatible serial port driver"
 	depends on 8250_SERIAL_CONSOLE
diff --git a/payloads/libpayload/configs/config.purin b/payloads/libpayload/configs/config.purin
deleted file mode 100644
index afcc199beb..0000000000
--- a/payloads/libpayload/configs/config.purin
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_LP_GPL=y
-CONFIG_LP_ARCH_ARM=y
-# CONFIG_LP_CURSES is not set
-CONFIG_LP_SKIP_CONSOLE_INIT=y
-# CONFIG_LP_VIDEO_CONSOLE is not set
-# CONFIG_LP_STORAGE is not set
-CONFIG_LP_TIMER_CYGNUS=y
-CONFIG_LP_USB=y
-# CONFIG_LP_USB_HID is not set
-# CONFIG_LP_USB_HUB is not set
-# CONFIG_LP_USB_MSC is not set
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index 2d70856f0a..40e587c223 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -37,7 +37,6 @@ libc-$(CONFIG_LP_8250_SERIAL_CONSOLE) += serial/8250.c serial/serial.c
 libc-$(CONFIG_LP_S5P_SERIAL_CONSOLE) += serial/s5p.c serial/serial.c
 libc-$(CONFIG_LP_IPQ806X_SERIAL_CONSOLE) += serial/ipq806x.c serial/serial.c
 libc-$(CONFIG_LP_IPQ40XX_SERIAL_CONSOLE) += serial/ipq40xx.c serial/serial.c
-libc-$(CONFIG_LP_BG4CD_SERIAL_CONSOLE) += serial/bg4cd.c serial/serial.c
 libc-$(CONFIG_LP_PC_KEYBOARD) += i8042/keyboard.c
 libc-$(CONFIG_LP_PC_MOUSE) += i8042/mouse.c
 libc-$(CONFIG_LP_PC_I8042) += i8042/i8042.c
@@ -55,8 +54,6 @@ libc-y += timer/generic.c
 endif
 libc-$(CONFIG_LP_TIMER_RDTSC) += timer/rdtsc.c
 libc-$(CONFIG_LP_TIMER_IMG_PISTACHIO) += timer/img_pistachio.c
-libc-$(CONFIG_LP_TIMER_ARMADA38X) += timer/armada38x.c
-libc-$(CONFIG_LP_TIMER_MVMAP2315) += timer/mvmap2315.c
 libc-$(CONFIG_LP_TIMER_ARM64_ARCH) += timer/arm64_arch_timer.c
 
 # Video console drivers
diff --git a/payloads/libpayload/drivers/serial/bg4cd.c b/payloads/libpayload/drivers/serial/bg4cd.c
deleted file mode 100644
index a4012076f4..0000000000
--- a/payloads/libpayload/drivers/serial/bg4cd.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2014 Google Electronics
- *
- * 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 <libpayload-config.h>
-#include <libpayload.h>
-
-void serial_putchar(unsigned int c)
-{
-}
-
-int serial_havechar(void)
-{
-	return 0;
-}
-
-int serial_getchar(void)
-{
-	return 0;
-}
-
-static struct console_input_driver consin = {
-	.havekey = &serial_havechar,
-	.getchar = &serial_getchar
-};
-
-static struct console_output_driver consout = {
-	.putchar = &serial_putchar
-};
-
-void serial_console_init(void)
-{
-	console_add_input_driver(&consin);
-	console_add_output_driver(&consout);
-}
diff --git a/payloads/libpayload/drivers/timer/Kconfig b/payloads/libpayload/drivers/timer/Kconfig
index 54cbe4a663..f1542cf9db 100644
--- a/payloads/libpayload/drivers/timer/Kconfig
+++ b/payloads/libpayload/drivers/timer/Kconfig
@@ -33,12 +33,6 @@ config TIMER_TEGRA_1US
 config TIMER_IPQ806X
 	bool "Timer for ipq806x platforms"
 
-config TIMER_ARMADA38X
-        bool "Timer for armada38x platforms"
-	help
-	  This is the timer driver for marvell armada38x
-	  platforms.
-
 config TIMER_IPQ40XX
 	bool "Timer for ipq40xx platforms"
 	help
@@ -56,43 +50,16 @@ config TIMER_RK3288
 config TIMER_RK3399
 	bool "Timer for Rockchip RK3399"
 
-config TIMER_CYGNUS
-	bool "Timer for Cygnus"
-
 config TIMER_IMG_PISTACHIO
 	bool "Timer for IMG Pistachio"
 
 config TIMER_MTK
 	bool "Timer for MediaTek MT8173"
 
-config TIMER_MVMAP2315
-	bool "Timer for Marvell MVMAP2315"
-
 endchoice
 
-config ARMADA38X_TIMER_FREQ
-        int "Hardware timer frequency"
-        depends on TIMER_ARMADA38X
-        default 25000000
-
-config ARMADA38X_TIMER_REG
-        hex "Timer register address"
-        default 0xF1020314
-        depends on TIMER_ARMADA38X
-
-config MVMAP2315_TIMER_FREQ
-	int "Hardware timer frequency"
-	depends on TIMER_MVMAP2315
-	default 1000000
-
-config MVMAP2315_TIMER_REG
-	hex "Timer register address"
-	depends on TIMER_MVMAP2315
-	default 0xE1020004
-
 config TIMER_GENERIC_HZ
 	int "Generic Timer Frequency"
-	default 500000000 if TIMER_CYGNUS
 	default 48000000 if TIMER_IPQ40XX
 	default 6250000 if TIMER_IPQ806X
 	default 24000000 if TIMER_MCT
@@ -107,7 +74,6 @@ config TIMER_GENERIC_HZ
 
 config TIMER_GENERIC_REG
 	hex "Generic Timer Register Address"
-	default 0x19020200 if TIMER_CYGNUS
 	default 0x004A2000 if TIMER_IPQ40XX
 	default 0x0200A028 if TIMER_IPQ806X
 	default 0x101C0100 if TIMER_MCT
@@ -121,7 +87,6 @@ config TIMER_GENERIC_REG
 
 config TIMER_GENERIC_HIGH_REG
 	hex "Generic Timer High Register Address"
-	default 0x19020204 if TIMER_CYGNUS
 	default 0x004A2004 if TIMER_IPQ40XX
 	default 0x101C0104 if TIMER_MCT
 	default 0xff81002C if TIMER_RK3288
diff --git a/payloads/libpayload/drivers/timer/armada38x.c b/payloads/libpayload/drivers/timer/armada38x.c
deleted file mode 100644
index 2a060bb848..0000000000
--- a/payloads/libpayload/drivers/timer/armada38x.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2015 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 <libpayload.h>
-#include <libpayload-config.h>
-
-uint64_t timer_hz(void)
-{
-	return CONFIG_LP_ARMADA38X_TIMER_FREQ;
-}
-
-uint64_t timer_raw_value(void)
-{
-	static uint64_t total_ticks = 0;
-	uint64_t overflow = 0;
-	uint32_t current_ticks =
-	    0xffffffff - readl((void *)CONFIG_LP_ARMADA38X_TIMER_REG);
-
-	/* It assumes only one overflow happened since the last call */
-	if (current_ticks <= (uint32_t)total_ticks)
-		overflow = 1ULL << 32;
-	/* The least significant part(32 bits) of total_ticks will always
-	 * become equal to current ticks */
-	total_ticks = (((total_ticks + overflow) >> 32) << 32) + current_ticks;
-	return total_ticks;
-}
diff --git a/payloads/libpayload/drivers/timer/mvmap2315.c b/payloads/libpayload/drivers/timer/mvmap2315.c
deleted file mode 100644
index 5b1f81376a..0000000000
--- a/payloads/libpayload/drivers/timer/mvmap2315.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2016 Marvell 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 <assert.h>
-#include <libpayload.h>
-
-static u32 *reg = (void *)CONFIG_LP_MVMAP2315_TIMER_REG;
-
-uint64_t timer_hz(void)
-{
-	return CONFIG_LP_MVMAP2315_TIMER_FREQ;
-}
-
-uint64_t timer_raw_value(void)
-{
-	/* invert count to change from down to up count */
-	return ~readl(reg);
-}