From patchwork Tue Sep 13 16:06:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 76085 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1435661qgf; Tue, 13 Sep 2016 09:08:38 -0700 (PDT) X-Received: by 10.28.138.140 with SMTP id m134mr1463523wmd.92.1473782918162; Tue, 13 Sep 2016 09:08:38 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id bp2si21546186wjb.158.2016.09.13.09.08.37; Tue, 13 Sep 2016 09:08:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 107EBA75BC; Tue, 13 Sep 2016 18:07:48 +0200 (CEST) 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 45Fktt6B20JD; Tue, 13 Sep 2016 18:07:47 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BF728A75CA; Tue, 13 Sep 2016 18:06:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4E8554B9AD for ; Tue, 13 Sep 2016 18:06:36 +0200 (CEST) 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 4Ca9nmxVDBgA for ; Tue, 13 Sep 2016 18:06:36 +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 conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by theia.denx.de (Postfix) with ESMTPS id 2CA3C4B9B0 for ; Tue, 13 Sep 2016 18:06:34 +0200 (CEST) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-08.nifty.com with ESMTP id u8DG6H9L022555; Wed, 14 Sep 2016 01:06:25 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u8DG6H9L022555 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1473782785; bh=93RBIJ0M4dT1fAS0ul0PAUHdFynUVYZ/DbwBU9rUGM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2D6LZeiHsBuxS6QSnjnj71VGEgWIkutPoKME1jo+wNMLp7+M+Mo9ANiRy0K/urryc YPYAU36HWnmCQ/3gCyb88EObtpS6U9C1QXBfzBAmlRL7bCyZptf65SZBFFtmjY/TTH jWkKND3A/yaRpwO8uZgmL5sJOVxn9WPJM/zdlo7BoWD5I3K68/0I2/STO7+zziQhaB pEF0GNW3KqM7nVNUjzoebz1ttuTIFSJNTEF8M8yx4r1zzBxfhHvn4bh+SY9gEQwyIq WE+95KjpkHoHzpZRyExm0cUTDw+W1tkDXT3IVY1tQsid18GHoXtJkUTrI4w2mS0wfg /T7tKe0LY1UkA== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 14 Sep 2016 01:06:07 +0900 Message-Id: <1473782770-20130-10-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473782770-20130-1-git-send-email-yamada.masahiro@socionext.com> References: <1473782770-20130-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 09/12] ARM: uniphier: use checkboard() instead of misc_init_f() 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" We can use checkboard() stub to show additional board information, so misc_init_f() should not be used for this purpose. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/Makefile | 1 - arch/arm/mach-uniphier/micro-support-card.c | 2 +- arch/arm/mach-uniphier/micro-support-card.h | 12 +++--------- arch/arm/mach-uniphier/print_misc_info.c | 12 ------------ include/configs/uniphier.h | 1 - 5 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 arch/arm/mach-uniphier/print_misc_info.c -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile index 774ea99..2e92e15 100644 --- a/arch/arm/mach-uniphier/Makefile +++ b/arch/arm/mach-uniphier/Makefile @@ -11,7 +11,6 @@ else obj-$(CONFIG_BOARD_EARLY_INIT_F) += board_early_init_f.o obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o -obj-$(CONFIG_MISC_INIT_F) += print_misc_info.o obj-y += dram_init.o obj-y += board_common.o obj-$(CONFIG_BOARD_EARLY_INIT_R) += board_early_init_r.o diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index 6987d1e..04e6558 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -49,7 +49,7 @@ static int support_card_show_revision(void) return 0; } -int check_support_card(void) +int checkboard(void) { printf("SC: Micro Support Card "); return support_card_show_revision(); diff --git a/arch/arm/mach-uniphier/micro-support-card.h b/arch/arm/mach-uniphier/micro-support-card.h index 5da0ada..630c98d 100644 --- a/arch/arm/mach-uniphier/micro-support-card.h +++ b/arch/arm/mach-uniphier/micro-support-card.h @@ -4,14 +4,13 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef ARCH_BOARD_H -#define ARCH_BOARD_H +#ifndef MICRO_SUPPORT_CARD_H +#define MICRO_SUPPORT_CARD_H #if defined(CONFIG_MICRO_SUPPORT_CARD) void support_card_reset(void); void support_card_init(void); void support_card_late_init(void); -int check_support_card(void); void led_puts(const char *s); #else static inline void support_card_reset(void) @@ -26,14 +25,9 @@ static inline void support_card_late_init(void) { } -static inline int check_support_card(void) -{ - return 0; -} - static inline void led_puts(const char *s) { } #endif -#endif /* ARCH_BOARD_H */ +#endif /* MICRO_SUPPORT_CARD_H */ diff --git a/arch/arm/mach-uniphier/print_misc_info.c b/arch/arm/mach-uniphier/print_misc_info.c deleted file mode 100644 index 695b7ae..0000000 --- a/arch/arm/mach-uniphier/print_misc_info.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (C) 2015 Masahiro Yamada - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include "micro-support-card.h" - -int misc_init_f(void) -{ - return check_support_card(); -} diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index b3ca46b..1e601b9 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -31,7 +31,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_MISC_INIT_F #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_BOARD_LATE_INIT