From patchwork Wed Jul 8 11:58:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 492870 X-Patchwork-Delegate: trini@ti.com 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 2D4131402B1 for ; Wed, 8 Jul 2015 22:00:15 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2096D4B9D3; Wed, 8 Jul 2015 14:00:01 +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 ILCEAf5rNwfz; Wed, 8 Jul 2015 14:00:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0B3144BA05; Wed, 8 Jul 2015 13:59:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D51B24B9F4 for ; Wed, 8 Jul 2015 13:59:46 +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 0ZUr1-3S9l6C for ; Wed, 8 Jul 2015 13:59:46 +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 mout.perfora.net (mout.perfora.net [74.208.4.196]) by theia.denx.de (Postfix) with ESMTPS id 121954B9C3 for ; Wed, 8 Jul 2015 13:59:30 +0200 (CEST) Received: from localhost.localdomain ([46.140.72.82]) by mrelay.perfora.net (mreueus002) with ESMTPSA (Nemesis) id 0M0jHc-1Ysg5i0Gli-00usx5; Wed, 08 Jul 2015 13:59:16 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Wed, 8 Jul 2015 13:58:48 +0200 Message-Id: <5daa7cabcbe1796565dac042dc016ce1c5be0ce1.1436175196.git.marcel.ziswiler@toradex.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: X-Provags-ID: V03:K0:oJEOdUBxZm4A6KaNiVi8xoncGZVEGLkkO1+bFLLxEnUfISmbP6s 7qTzqPjlFh1+1k4ZFh5YHio9dQC/feQaCdRxFsZ/KYia0kkUFg3gaY2igsgV5b4Fgd1hXxA uqaeVO+Qw0lTrR69PA48xhSARYCvwoEUCQ5MAVyOfCdNkx+hsKLDWk9/pJHobbOjyLXLQA3 ZfQnv+mpf6fZvTzeB9Utw== X-UI-Out-Filterresults: notjunk:1; V01:K0:TZfWGXE4rlk=:ReQ0nGplNLcg7KEMs2fKtb TgAn1QYYW6JvlMR+Omh3YoJoRbrEMO43Mni2i6Hg2/FdShA5qqsoiZtOoON7LBMWPyZwq3Mjp SWQF4NvRnJndyJt+M4QN6oSVxnIPPL4aS2thR4CJs+Bfy+mI0kzo7BPeb4iKIWrSfY109Rww1 WmnGirgCVXP6vQpjR8xVMfbqG2CaaN+yGmW0d+36PNGlOMYM2Us7QbASFXQyyHuvcK5zSshVr vAE34+mElPu7ezhDzSO6IiHOl0fxKugZkhGtW+qlsRhKCiVZhwff5GnKIWZ/aH7GJSPvm6fif J0CT2V1MZvEc02abxIOuhtHArsdzOdj0n6pxHp0FUFphcTN/kvmzm/MKHIqGGzs2USosHTIE4 8f7lAZjBkjYunPtMs0Q36hxZpJPKUFYoUAts9UwFxh9mTaZVdQLQtlV4BHpdOkxSxPf8PKf4X OVQtiAUzTayHis8bFl1Q9XDmBgTyS17aKEIOIFCW7hCuYvnHwjHYFNcCFzNfNpV3q4edXte/Y 177ByAHmgwmnEb/Jl3PMOsgwvCiwo9yBS+1evrXmFdL5b8o247SCRUqqGGCzuDNVmPvLZkLqQ CM3LihmSSQDX6naNZtuXidfrFlrw62gd6HakxEnO08GoZm5+aqrMQh7AlR5vSo9o7c/Kc/Adi aD7tXW/CCZc7X+MuweGg0M/sE Cc: Marek Vasut , Tom Rini , Stefan Agner , Joe Hershberger , Marcel Ziswiler , Max Krummenacher , Scott Wood Subject: [U-Boot] [PATCH v2 3/8] generic-board: allow showing custom board info 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" From: Marcel Ziswiler Allow showing custom board info from a checkboard() function being implemented if CONFIG_CUSTOM_BOARDINFO is specified. Previously the device tree model was always displayed not taking any CONFIG_CUSTOM_BOARDINFO into account. Signed-off-by: Marcel Ziswiler Reviewed-by: Simon Glass --- Changes in v2: reword commit message as requested by Simon common/board_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_info.c b/common/board_info.c index 42d0641..a692f74 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -19,7 +19,7 @@ int __weak checkboard(void) */ int show_board_info(void) { -#ifdef CONFIG_OF_CONTROL +#if defined(CONFIG_OF_CONTROL) && !defined(CONFIG_CUSTOM_BOARDINFO) DECLARE_GLOBAL_DATA_PTR; const char *model;