From patchwork Fri Nov 13 08:11:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 544113 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 826E71409A0 for ; Fri, 13 Nov 2015 19:11:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=QQuxUoMb; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 176104BB4C; Fri, 13 Nov 2015 09:09:44 +0100 (CET) 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 q6GGASYk4VCM; Fri, 13 Nov 2015 09:09:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A7CAC4BADE; Fri, 13 Nov 2015 09:09:09 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 453914BAF5 for ; Fri, 13 Nov 2015 09:08:54 +0100 (CET) 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 UTAsgP0k5pAv for ; Fri, 13 Nov 2015 09:08:54 +0100 (CET) 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-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by theia.denx.de (Postfix) with ESMTPS id 27A014BACD for ; Fri, 13 Nov 2015 09:08:48 +0100 (CET) Received: by pabfh17 with SMTP id fh17so93219744pab.0 for ; Fri, 13 Nov 2015 00:08:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=kfxHi1ilXKYOW3TddQhwtF5C/PFRf+PtCMGtZm+5/8I=; b=QQuxUoMbKP/19oatfjbWHb8QJcfghm807vuFzPzl9F89WqlkDiwGNCeu1MNOxme2GZ NmFCfFj8AqkXKVBerP1o6jmYtAuSDnFklAudfrHYo9gpDF7FueqDMCoJkFtirot7Larl 06FIqdyPpx4ty5oA3IAPvfg5dxKHctn+UvNiJQpHM0zVvswyQV08OQZIO2u9B2Qm1GW/ veS8Gqne2qV1zmNs3AhM9S8RKpcqh5JWD6KH/j/6cN/u9pwWlD3pNJzZczsqbVSBzmRD N8vhV/xwJV2Id2j+5Y+mPPAWIR9qAhezo2jKYtyix7vpmtD+3KEuRU4h+zKb6+31HXIc U1OA== X-Received: by 10.68.91.162 with SMTP id cf2mr20038304pbb.34.1447402127195; Fri, 13 Nov 2015 00:08:47 -0800 (PST) Received: from ala-d2121-lx1.wrs.com (unknown-157-139.windriver.com. [147.11.157.139]) by smtp.gmail.com with ESMTPSA id h10sm18857209pat.7.2015.11.13.00.08.46 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Nov 2015 00:08:46 -0800 (PST) From: Bin Meng To: Simon Glass , Thomas Chou , U-Boot Mailing List Date: Fri, 13 Nov 2015 00:11:24 -0800 Message-Id: <1447402284-26598-12-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1447402284-26598-1-git-send-email-bmeng.cn@gmail.com> References: <1447402284-26598-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v3 11/11] x86: tsc: Move tsc_timer.c to drivers/timer X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" To group all dm timer drivers together, move tsc timer to drivers/timer directory. Signed-off-by: Bin Meng Acked-by: Simon Glass --- Changes in v3: None Changes in v2: None arch/x86/lib/Makefile | 1 - drivers/timer/Kconfig | 7 +++++++ drivers/timer/Makefile | 1 + {arch/x86/lib => drivers/timer}/tsc_timer.c | 0 include/configs/x86-common.h | 2 -- 5 files changed, 8 insertions(+), 3 deletions(-) rename {arch/x86/lib => drivers/timer}/tsc_timer.c (100%) diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index d676e2c..cd5ecb6 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -34,7 +34,6 @@ obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o obj-y += string.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o obj-y += tables.o -obj-$(CONFIG_SYS_X86_TSC_TIMER) += tsc_timer.o obj-$(CONFIG_CMD_ZBOOT) += zimage.o obj-$(CONFIG_HAVE_FSP) += fsp/ diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 029af64..2b10d2b 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -23,4 +23,11 @@ config SANDBOX_TIMER Select this to enable an emulated timer for sandbox. It gets time from host os. +config X86_TSC_TIMER + bool "x86 Time-Stamp Counter (TSC) timer support" + depends on TIMER && X86 + default y if X86 + help + Select this to enable Time-Stamp Counter (TSC) timer for x86. + endmenu diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index 300946e..fe954ec 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_TIMER) += timer-uclass.o obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o +obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o diff --git a/arch/x86/lib/tsc_timer.c b/drivers/timer/tsc_timer.c similarity index 100% rename from arch/x86/lib/tsc_timer.c rename to drivers/timer/tsc_timer.c diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index ab9fa0b..7c3b673 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -154,8 +154,6 @@ * CPU Features */ -#define CONFIG_SYS_X86_TSC_TIMER - #define CONFIG_SYS_STACK_SIZE (32 * 1024) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN 0x200000