From patchwork Wed Jul 1 23:04: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: 490398 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 B426C1402B3 for ; Thu, 2 Jul 2015 09:12:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C96C94B669; Thu, 2 Jul 2015 01:11:59 +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 9OsVoCMB8iKv; Thu, 2 Jul 2015 01:11:59 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 57FD84B61C; Thu, 2 Jul 2015 01:11:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3B2DD4B616 for ; Thu, 2 Jul 2015 01:11:57 +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 G0QmczHPXXUm for ; Thu, 2 Jul 2015 01:11:57 +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.197]) by theia.denx.de (Postfix) with ESMTPS id AD0294B622 for ; Thu, 2 Jul 2015 01:11:56 +0200 (CEST) Received: from localhost.localdomain ([89.217.117.82]) by mrelay.perfora.net (mreueus003) with ESMTPSA (Nemesis) id 0MC2Zq-1ZJCW11itc-008qlw; Thu, 02 Jul 2015 01:05:46 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 2 Jul 2015 01:04:48 +0200 Message-Id: <6e757bd30e9d99ce23d1b457008d9cf73133d11c.1435791392.git.marcel.ziswiler@toradex.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: X-Provags-ID: V03:K0:Ws60WoVjBj6fc1y4xANpOFHRqfKMz6akh67fJO8dSZ33uHPdAMO SAP7g0NGjP5lHejtyUqpJMUgT/uOtxkQ7nb//MNkKimvtfBZDYV5/3DL2TVIKhsIabjk4E/ dK8vcpMEgOYOdsJaFHKCpbLcyeZrqcVw3zmZH06+ktC2iaepILG/VXThK1Av/FCcXQ6NAHc rh70W7HKnnJhRyg+OEQ/Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:srhQ1V8YvHc=:FtBYzOtjWV8Czdsd2yTIB8 aNJAyx+B8N54JcnVcrOXgMSrWrpjweKci8EsR4lYTCCMCXsMm5Z1qyqTugWKnTvKPj0pwJhYV TUpIQOLGdGKtW7BAEIMFnScoI3XP/He0S7Sxp9hX9wXVlaXwEVAh0yhaaV8pfPuicGMovIco4 LedaV/3PctIiJGgncuWSlgZK1n6VeJRkFzwp5LBXP4822VoeQABeNLB47+rHw5kZrnl1P7NwL Oz+od4tz5EtshrctP4EF9M4XEKbLOBUEgiEhjtHnZlCDVdLTu+l1qU8M980G/IZqo95Je8cxZ YqeuYiR6HEQ0phmh7Do100PCpg4WEbKdk3Y299/xnc1CTDZGOgyRYMtb3PKO3hyPkoM9dzcic irtonss0LntmFAr/cNpKj1NsbpNvN3JJoLMT5Duz047/9tgt6taz6vALY3VHeiwmmotk3kccy kyadBOMbFaAAeWPoOm1zMS17iZFMxxMZgHqfAtaNz0aR0AF2o2JN1LcXEslvdCNyd4LpheJNc H7rDPGj0Bu+iTQD2E+MbFkAi0BO6BcireKolCe6uXYY44ldoVSo7zE//gmtavi6W8C/TV+rnN j0rOcvZeq4oDul+cJiX8xz5IgbaOZMwIbUKO5PFQDzoq9SlBed/w27sNlTEgKKu9vgJz2bAxX nWpCfPwWXDMlrY8IWgjRopv5T Cc: Marek Vasut , Tom Rini , Stefan Agner , Marcel Ziswiler , Masahiro Yamada , Joe Hershberger , Max Krummenacher , Scott Wood Subject: [U-Boot] [PATCH 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. Signed-off-by: Marcel Ziswiler --- 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;