From patchwork Thu Nov 20 08:11:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 412578 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 1CFA014010B for ; Thu, 20 Nov 2014 19:11:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CF3DC4B639; Thu, 20 Nov 2014 09:11:20 +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 o9u-jTe7tmrI; Thu, 20 Nov 2014 09:11:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 46D044B61C; Thu, 20 Nov 2014 09:11:20 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 35E074B639 for ; Thu, 20 Nov 2014 09:11:15 +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 sygcazsXS5+T for ; Thu, 20 Nov 2014 09:11:15 +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-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by theia.denx.de (Postfix) with ESMTPS id 69B1E4B60C for ; Thu, 20 Nov 2014 09:11:10 +0100 (CET) Received: by mail-pa0-f44.google.com with SMTP id et14so2078647pad.31 for ; Thu, 20 Nov 2014 00:11:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=Xe8OCLTzuV/CGyU0ris1wkdBKR65fB6nDbIVaR9YCHQ=; b=op1Im2YQAUCmtCNIXmIJRdFbjCZw6oJCh184Nec7jKR5Z+mOv7AoD0mT4sBAnSDIFr pVck9e5ViXV8wBQp9RC9i8BD2orE1sqDJCD+sdtSlypRYhybZduDRaylfzhxQuPgRWcn rzju/qFBAphdhz3DZMSS8b2OZf3dnBF9C0QdrCtw3tVnXuv7UGWedlpvoXm6+1LU4ie5 uugNibOVwb2ywc6H46rjLOJCfrD9T4PASmDyJ8Bv8jsOg3atf1ABv+bfy8DKrW3jClWf P3hp83QiLk6VlN688ssvmx7oxwqIwOhKAUqsA1IkgDjBkwKvcxU6Sq4WR6bYdm81fGYN z4zg== X-Received: by 10.68.68.130 with SMTP id w2mr18592778pbt.167.1416471068254; Thu, 20 Nov 2014 00:11:08 -0800 (PST) Received: from localhost ([106.120.101.38]) by mx.google.com with ESMTPSA id qm9sm1320193pac.14.2014.11.20.00.11.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 20 Nov 2014 00:11:07 -0800 (PST) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Thu, 20 Nov 2014 16:11:00 +0800 Message-Id: <1416471060-16135-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.8.2.1 Subject: [U-Boot] [PATCH 2/4] x86: Remove cpu_init_r() for x86 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 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 Since cpu_init_interrupts() was moved out of cpu_init_r(), it is useless to keep cpu_init_r() for x86, thus remove it. Signed-off-by: Bin Meng Acked-by: Simon Glass Tested-by: Simon Glass --- arch/x86/cpu/cpu.c | 6 ------ arch/x86/include/asm/u-boot-x86.h | 2 -- common/board_r.c | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index cf0606e..1a6f679 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -319,12 +319,6 @@ int x86_cpu_init_f(void) return 0; } -int x86_cpu_init_r(void) -{ - return 0; -} -int cpu_init_r(void) __attribute__((weak, alias("x86_cpu_init_r"))); - void x86_enable_caches(void) { unsigned long cr0; diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 0399417..f454b83 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -10,8 +10,6 @@ /* cpu/.../cpu.c */ int arch_cpu_init(void); -int x86_cpu_init_r(void); -int cpu_init_r(void); int x86_cpu_init_f(void); int cpu_init_f(void); void init_gd(gd_t *id, u64 *gdt_addr); diff --git a/common/board_r.c b/common/board_r.c index 7c33900..b5ea030 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -774,7 +774,7 @@ init_fnc_t init_sequence_r[] = { initr_flash, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_PPC) || defined(CONFIG_X86) +#if defined(CONFIG_PPC) /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, #endif