diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-01 17:25:41 +0300 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-09 13:07:38 +0000 |
commit | 76c43866990bf61c35b1fb6f6915614eebc8d4a4 (patch) | |
tree | 112cb5a5b27b110c7c7de827ff8fdaf8df2d82a8 /src/cpu | |
parent | c6b152a976e02b1693a2f8239b11675e80acf541 (diff) |
arch/non-x86: Flip HAVE_MONOTONIC_TIMER default
Also remove allwinner/a10 dummy monotonic_timer
implementation.
Change-Id: I9dfa9b92dc63375465e3bb87b73eeefad601c810
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34112
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/allwinner/a10/Kconfig | 2 | ||||
-rw-r--r-- | src/cpu/allwinner/a10/Makefile.inc | 1 | ||||
-rw-r--r-- | src/cpu/allwinner/a10/monotonic_timer.c | 25 | ||||
-rw-r--r-- | src/cpu/qemu-power8/Kconfig | 1 | ||||
-rw-r--r-- | src/cpu/ti/am335x/Kconfig | 2 |
5 files changed, 2 insertions, 29 deletions
diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig index 87693ed600..0b5d9bf60d 100644 --- a/src/cpu/allwinner/a10/Kconfig +++ b/src/cpu/allwinner/a10/Kconfig @@ -10,7 +10,7 @@ config CPU_SPECIFIC_OPTIONS select ARCH_VERSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 - select HAVE_MONOTONIC_TIMER + select NO_MONOTONIC_TIMER select HAVE_UART_SPECIAL select UART_OVERRIDE_REFCLK select BOOT_DEVICE_NOT_SPI_FLASH diff --git a/src/cpu/allwinner/a10/Makefile.inc b/src/cpu/allwinner/a10/Makefile.inc index a6cd4b48a7..cbdb5ae856 100644 --- a/src/cpu/allwinner/a10/Makefile.inc +++ b/src/cpu/allwinner/a10/Makefile.inc @@ -17,7 +17,6 @@ ramstage-y += bootblock_media.c ramstage-y += cbmem.c ramstage-y += clock.c ramstage-y += cpu.c -ramstage-y += monotonic_timer.c ramstage-y += timer.c ramstage-y += twi.c diff --git a/src/cpu/allwinner/a10/monotonic_timer.c b/src/cpu/allwinner/a10/monotonic_timer.c deleted file mode 100644 index 479dee9471..0000000000 --- a/src/cpu/allwinner/a10/monotonic_timer.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Alexandru Gagniuc <mr.nuke.me@gmail.com> - * - * 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 Licenseor (at your option) - * any later version. - * - * 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. - * - * Placeholder for code to come (needed to complete build) - * - */ - -#include <timer.h> - -void timer_monotonic_get(struct mono_time *mt) -{ - (void)mt; -} diff --git a/src/cpu/qemu-power8/Kconfig b/src/cpu/qemu-power8/Kconfig index c1f8309795..ef995b6398 100644 --- a/src/cpu/qemu-power8/Kconfig +++ b/src/cpu/qemu-power8/Kconfig @@ -19,3 +19,4 @@ config CPU_QEMU_POWER8 select ARCH_VERSTAGE_PPC64 select ARCH_ROMSTAGE_PPC64 select ARCH_RAMSTAGE_PPC64 + select NO_MONOTONIC_TIMER diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig index 20e7458baf..6de5eb4df3 100644 --- a/src/cpu/ti/am335x/Kconfig +++ b/src/cpu/ti/am335x/Kconfig @@ -3,9 +3,7 @@ config CPU_TI_AM335X select ARCH_VERSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 - select HAVE_MONOTONIC_TIMER select HAVE_UART_SPECIAL - select GENERIC_UDELAY select UART_OVERRIDE_REFCLK select BOOT_DEVICE_NOT_SPI_FLASH bool |