From patchwork Fri Dec 16 08:16:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 706346 X-Patchwork-Delegate: monstr@monstr.eu 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 3tg37F0Mwvz9t2N for ; Fri, 16 Dec 2016 19:16:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="VaLwX1vs"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 55F33A75B7; Fri, 16 Dec 2016 09:16:37 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 vbcmvsgs-tfa; Fri, 16 Dec 2016 09:16:37 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B1B6DA75D2; Fri, 16 Dec 2016 09:16:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9CA1B4BA16 for ; Fri, 16 Dec 2016 09:16:22 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 vOP0nR07AG4y for ; Fri, 16 Dec 2016 09:16:22 +0100 (CET) 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-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by theia.denx.de (Postfix) with ESMTPS id 3CC4A4B99D for ; Fri, 16 Dec 2016 09:16:18 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id a20so3703070wme.2 for ; Fri, 16 Dec 2016 00:16:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=AuyLFUaalo6qV8YJxccPpr1MO2QXyS7Otmk/THjnp20=; b=VaLwX1vs82a1abRQv7sPA/KgGwQCDEzlaLxiSEaNk/7I2MUeHqK8A4qbnqtJmDP8AX 5785Nu9vWC1veGAZWcS2WVeWV7xPujAEJMRyWVDXg4G/EJAk+YATY7RUkOnUKS+udUwM 5ZHhsKU3FuG+czUvrSjc9+6883dnDOUEmf+Ms0Y4ugPAQvs0AyATw7U+Z5AfAQsjcHsa mIi7xDCTn+43pqJ2J8eXz2ffroDT2Y+oMtMiOPJZTy7g6QpZvSbQCGr3HjPq/gMrLd7c IK1jMKlsNadAdwZDIvH1NcnSMAm5HN1saa0q+7H7LS4dkd+pKX3smbZAwpBf129zYENL B5uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=AuyLFUaalo6qV8YJxccPpr1MO2QXyS7Otmk/THjnp20=; b=uRQ7DxMP39j1LcAKh8k3BnO/6A+qWa+X7fHohT0Jso5BqBnHhMKfOG70X0aAQPIA/+ bw7VUOBhr5qUyDmsFKU7m6HjtWNaF0jXr6el31Wc7RKVnFc5nrdjJUViXA5aEGkKJz9R T9sKnZEgiJvPizyq5Dfzc+OJ12/4aGppA7PF7PU48uIAZzfNaBen0I+3ekgItCoi6DX8 2mObpvxQrdu2TUZzFNf5wjNe4p1xfWhhdln0AD43xzuqbAmHNdNMjkHXjhKxeJl/fByX I92sO8QIO/KSQVTvoPWAv5xCRKA5ResSSdvMK0RASRvlPwBRxBSNZcd9BpIgxd8Ha/0J YtIg== X-Gm-Message-State: AIkVDXJ79MUNsgU3KMuHkvRlJNKowyUVJ8VgxF6JsPyqq1P4hyTDHItOmxaCSTR/pcDBlQ== X-Received: by 10.28.183.215 with SMTP id h206mr1642998wmf.60.1481876178414; Fri, 16 Dec 2016 00:16:18 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id cl10sm5702834wjb.4.2016.12.16.00.16.17 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 16 Dec 2016 00:16:18 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Fri, 16 Dec 2016 09:16:15 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: <9912b36d7eb5e138d055e74e4e92b56222eb89b1.1481876173.git.michal.simek@xilinx.com> References: <9912b36d7eb5e138d055e74e4e92b56222eb89b1.1481876173.git.michal.simek@xilinx.com> In-Reply-To: <9912b36d7eb5e138d055e74e4e92b56222eb89b1.1481876173.git.michal.simek@xilinx.com> References: <9912b36d7eb5e138d055e74e4e92b56222eb89b1.1481876173.git.michal.simek@xilinx.com> Subject: [U-Boot] [PATCH 2/2] microblaze: Enable option to overwrite default variables 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" Enable overwriting variables out of main config file. Signed-off-by: Michal Simek --- include/configs/microblaze-generic.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 6b380f005ecc..36b0a0eb163c 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -241,6 +241,7 @@ #define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo" +#ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" \ "nor0=flash-0\0"\ "mtdparts=mtdparts=flash-0:"\ @@ -250,6 +251,7 @@ "setenv stdin nc\0" \ "serial=setenv stdout serial;"\ "setenv stdin serial\0" +#endif #define CONFIG_CMDLINE_EDITING