From patchwork Thu Apr 18 02:13:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 237400 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1E7102C0199 for ; Thu, 18 Apr 2013 12:16:17 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 47ECA4A2F7; Thu, 18 Apr 2013 04:16:03 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14ofH5ej8shS; Thu, 18 Apr 2013 04:16:03 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E93A54A2FE; Thu, 18 Apr 2013 04:15:13 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7FF244A304 for ; Thu, 18 Apr 2013 04:14:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VDXTGhXqrLGJ for ; Thu, 18 Apr 2013 04:14:56 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-qc0-f201.google.com (mail-qc0-f201.google.com [209.85.216.201]) by theia.denx.de (Postfix) with ESMTPS id 6B90F4A2E3 for ; Thu, 18 Apr 2013 04:14:38 +0200 (CEST) Received: by mail-qc0-f201.google.com with SMTP id o22so236269qcr.2 for ; Wed, 17 Apr 2013 19:14:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=APb7pOOnmd4iA/liD4j4Ouh/8Z5P95Kv9fbcHON43ec=; b=JaflFO9YtMFjrk8R4pblOlg+LIwnFWXA1ioIV6MPqWNtZ4/h8WDl1bptSvdvMNAZ4T uCDdFpNaOXIGE54r80yn0R5VbAGSC3VBtuG45G9cFW3YP9pDDt6RYElKLzx6IXgbK2cx ILdUadu9oOvV/EhGeZ0LB+8xXaE5r5PEoalcqBsAkS/9lVvAGGXH4GUNrBGYa/kY7gv8 Yffnap6vOYRYAkkoQ0y7PKu+S2gKrvPIiPdWJ59s18OSMmCA9qBJlteWrGAMpDT6xGN5 LJSvH6yEElP0/OQ9ab8mtDAR76Lj0r9waWLFFULCEzlwTVqALhJksfq7U9Ou2lHz+Kla ZdVg== X-Received: by 10.236.231.141 with SMTP id l13mr4535862yhq.19.1366251276333; Wed, 17 Apr 2013 19:14:36 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id g7si2109386yhf.0.2013.04.17.19.14.36 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Wed, 17 Apr 2013 19:14:36 -0700 (PDT) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.83.1]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 02BB532B09B; Wed, 17 Apr 2013 19:14:11 -0700 (PDT) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id B46D31607BF; Wed, 17 Apr 2013 19:14:10 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 17 Apr 2013 19:13:37 -0700 Message-Id: <1366251228-19884-9-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1366251228-19884-1-git-send-email-sjg@chromium.org> References: <1366251228-19884-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQkEiUCu+Xs1CzTHMJbmTFJZvcdwNgOpbruBpjMQ5b2pp0qyUEk6kwLsJr0kGWrivhaQIjZAcr0px4Ox5xCE1oqtACEdXoVMCCH1MMdqtXxVEJj9UCxjKmpHphjKLaGAqVPEtx4UIZGu8ASwTu7LaVggxzC8yjYuKjaSl5Y3Z8IrStQrTMhb2RkD728Q5wFXUHbqKYw3 Cc: Graeme Russ , u-boot-review@google.com Subject: [U-Boot] [PATCH 08/19] x86: Remove old broken timer implementation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Tidy up some old broken and unneeded implementations. These are not used by coreboot or anything else now. Signed-off-by: Simon Glass Reviewed-by: Gabe Black Reviewed-by: Michael Spang Reviewed-by: Vadim Bendebury Acked-by: Graeme Russ --- 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 - -/* 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