Patchwork [U-Boot,08/19] x86: Remove old broken timer implementation

login
register
mail settings
Submitter Simon Glass
Date April 18, 2013, 2:13 a.m.
Message ID <1366251228-19884-9-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/237400/
State Accepted, archived
Delegated to: Simon Glass
Headers show

Comments

Simon Glass - April 18, 2013, 2:13 a.m.
Tidy up some old broken and unneeded implementations. These are not used
by coreboot or anything else now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Reviewed-by: Michael Spang <spang@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
---
 arch/x86/cpu/Makefile |  2 +-
 arch/x86/cpu/timer.c  | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 arch/x86/cpu/timer.c
Graeme Russ - April 18, 2013, 2:51 a.m.
Hi Simon,

On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> Tidy up some old broken and unneeded implementations. These are not used
> by coreboot or anything else now.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Gabe Black <gabeblack@chromium.org>
> Reviewed-by: Michael Spang <spang@chromium.org>
> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
> ---
>  arch/x86/cpu/Makefile |  2 +-
>  arch/x86/cpu/timer.c  | 20 --------------------
>  2 files changed, 1 insertion(+), 21 deletions(-)
>  delete mode 100644 arch/x86/cpu/timer.c
>
> diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
> index 7b520f8..cddf0dd 100644
> --- a/arch/x86/cpu/Makefile
> +++ b/arch/x86/cpu/Makefile
> @@ -30,7 +30,7 @@ LIB   = $(obj)lib$(CPU).o
>
>  START-y        = start.o
>  START-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
> -COBJS  = interrupts.o cpu.o timer.o
> +COBJS  = interrupts.o cpu.o
>
>  SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
>  OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
> diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
> deleted file mode 100644
> index f95fce5..0000000
> --- a/arch/x86/cpu/timer.c
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -/*
> - * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
> - * Use of this source code is governed by a BSD-style license that can be
> - * found in the LICENSE file.
> - *
> - * Alternatively, this software may be distributed under the terms of the
> - * GNU General Public License ("GPL") version 2 as published by the Free
> - * Software Foundation.
> - */
> -
> -#include <common.h>
> -
> -/* Temporary patch to maintain bisectability, removed in next commit */
> -#ifndef CONFIG_SYS_X86_TSC_TIMER
> -unsigned long timer_get_us(void)
> -{
> -       printf("timer_get_us used but not implemented.\n");
> -       return 0;
> -}
> -#endif
> --
> 1.8.2.1
>

Acked-by: Graeme Russ <graeme.russ@gmail.com>

Patch

diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 7b520f8..cddf0dd 100644
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@ -30,7 +30,7 @@  LIB	= $(obj)lib$(CPU).o
 
 START-y	= start.o
 START-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
-COBJS	= interrupts.o cpu.o timer.o
+COBJS	= interrupts.o cpu.o
 
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
deleted file mode 100644
index f95fce5..0000000
--- a/arch/x86/cpu/timer.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#include <common.h>
-
-/* Temporary patch to maintain bisectability, removed in next commit */
-#ifndef CONFIG_SYS_X86_TSC_TIMER
-unsigned long timer_get_us(void)
-{
-	printf("timer_get_us used but not implemented.\n");
-	return 0;
-}
-#endif