From patchwork Sun Jul 31 00:01:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Denk X-Patchwork-Id: 107525 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 E1B5DB6F77 for ; Sun, 31 Jul 2011 10:01:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7AB362812D; Sun, 31 Jul 2011 02:01:20 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 BsiVaCnO9317; Sun, 31 Jul 2011 02:01:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3657528118; Sun, 31 Jul 2011 02:01:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E654D28118 for ; Sun, 31 Jul 2011 02:01:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 zlCNiTp+qQYT for ; Sun, 31 Jul 2011 02:01:14 +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 mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by theia.denx.de (Postfix) with ESMTP id 59EF828115 for ; Sun, 31 Jul 2011 02:01:13 +0200 (CEST) Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 4AFA41C021DC; Sun, 31 Jul 2011 02:01:12 +0200 (CEST) X-Auth-Info: PpO+cVeBw3tRPM6uUsEo3sp12T7dZvNIsi+W85lOf0o= Received: from diddl.denx.de (host-80-81-18-216.customer.m-online.net [80.81.18.216]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 449371C00069; Sun, 31 Jul 2011 02:01:12 +0200 (CEST) Received: from gemini.denx.de (gemini.denx.de [10.0.0.2]) by diddl.denx.de (Postfix) with ESMTP id 10B7DC913109; Sun, 31 Jul 2011 02:01:12 +0200 (CEST) Received: by gemini.denx.de (Postfix, from userid 500) id EE9EC12B7AE4; Sun, 31 Jul 2011 02:01:11 +0200 (CEST) From: Wolfgang Denk To: u-boot@lists.denx.de Date: Sun, 31 Jul 2011 02:01:08 +0200 Message-Id: <1312070468-17261-1-git-send-email-wd@denx.de> X-Mailer: git-send-email 1.7.6 Cc: Stefan Roese Subject: [U-Boot] [PATCH] environment.h: fix warning: "CONFIG_ENV_IS_EMBEDDED" redefined X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 Signed-off-by: Wolfgang Denk Cc: Stefan Roese --- include/environment.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/environment.h b/include/environment.h index e8b6e45..6394a96 100644 --- a/include/environment.h +++ b/include/environment.h @@ -124,7 +124,9 @@ extern unsigned long nand_env_oob_offset; /* The build system likes to know if the env is embedded */ #ifdef DO_DEPS_ONLY # ifdef ENV_IS_EMBEDDED -# define CONFIG_ENV_IS_EMBEDDED +# ifndef CONFIG_ENV_IS_EMBEDDED +# define CONFIG_ENV_IS_EMBEDDED +# endif # endif #endif