From patchwork Fri Jun 17 05:24: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: 70279 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp107602qgy; Thu, 16 Jun 2016 22:23:01 -0700 (PDT) X-Received: by 10.28.56.68 with SMTP id f65mr19261890wma.58.1466140981826; Thu, 16 Jun 2016 22:23:01 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id z2si9778119wje.23.2016.06.16.22.23.01; Thu, 16 Jun 2016 22:23:01 -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 074CDA75E6; Fri, 17 Jun 2016 07:23: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 P05LalxyzKLv; Fri, 17 Jun 2016 07:23:00 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 807B8A7559; Fri, 17 Jun 2016 07:23:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3CDCBA7559 for ; Fri, 17 Jun 2016 07:22: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 7itMu3wPx_vz for ; Fri, 17 Jun 2016 07:22: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 conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by theia.denx.de (Postfix) with ESMTPS id 7FA23A7532 for ; Fri, 17 Jun 2016 07:22:51 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id u5H5Mkte024408; Fri, 17 Jun 2016 14:22:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com u5H5Mkte024408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1466140967; bh=DYbbU7oniFpc4fnhQ/8GEvj1U9Sr1PbcDM/3wUfIni4=; h=From:To:Cc:Subject:Date:From; b=cLFvYEqa2a6gG5in8vU40Tw8f8iR6ddvJ2BwpxfOu4+/sxYuSiobKR9gTMCIFjpHZ 9lrFZbNhkitg0gXPoaQC+cAb4W3BGfILs7XZAGCY0eALBTeNq6b6V3+Ab7dypjL+vs IF0Uceh80CWNY/OWhX9djn1UjNbhzJOtoRp5BtdieI/0ofm+8fP3KORNFSFTrdO+p8 lgnvHY7hQmSP9kzi39H3W/PGrvVJqICwk1Ko5VO7C8SnMn4npKCN1VFyPQz9YZO3wR plQVBK0Q0k1RIon0F5uRUImlaTQX+WgkxV4RbaYO2Qq+MUdhJ+ow/Y9yyUDc0xYWCr hqpLMZT21PD9g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Fri, 17 Jun 2016 14:24:07 +0900 Message-Id: <1466141047-23521-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] env: avoid build error for boards without CONFIG_SYS_{CPU, BOARD} 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" If CONFIG_ENV_VARS_UBOOT_CONFIG is enabled (it is by distro), this code causes build error for boards without CONFIG_SYS_{CPU,_BOARD}. Signed-off-by: Masahiro Yamada --- include/env_default.h | 4 ++++ 1 file changed, 4 insertions(+) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/include/env_default.h b/include/env_default.h index 3096576..ea6704a 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -90,9 +90,13 @@ const uchar default_environment[] = { #endif #ifdef CONFIG_ENV_VARS_UBOOT_CONFIG "arch=" CONFIG_SYS_ARCH "\0" +#ifdef CONFIG_SYS_CPU "cpu=" CONFIG_SYS_CPU "\0" +#endif +#ifdef CONFIG_SYS_BOARD "board=" CONFIG_SYS_BOARD "\0" "board_name=" CONFIG_SYS_BOARD "\0" +#endif #ifdef CONFIG_SYS_VENDOR "vendor=" CONFIG_SYS_VENDOR "\0" #endif