From patchwork Tue May 26 18:04:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 476686 X-Patchwork-Delegate: sbabic@denx.de 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 4D7D81402B5 for ; Wed, 27 May 2015 04:05:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7F2074B68A; Tue, 26 May 2015 20:05:37 +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 WUWz2YThOVda; Tue, 26 May 2015 20:05:37 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D28F84B660; Tue, 26 May 2015 20:05:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A89D94A039 for ; Tue, 26 May 2015 20:05:20 +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 RIry9vskHqp3 for ; Tue, 26 May 2015 20:05:20 +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-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by theia.denx.de (Postfix) with ESMTPS id 34F6F4A01C for ; Tue, 26 May 2015 20:05:15 +0200 (CEST) Received: by paza2 with SMTP id a2so89148588paz.3 for ; Tue, 26 May 2015 11:05:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C7JfIDRFWsCGgFc1ExTAbP10w5/ZU17YSbuxm3aigMw=; b=lkKR/zb6Wihyu7+LlWCMoW3GFSKUoGzZPSnDAyc5qRsAWYJq3imdF3KgVT7teWM2FR OlLrAfYdTJOKnsBihkmhrDZQgG7HmTwKzdDx58odd5/GJpy6yt9paKnY0nlM70++rbmf k34QppCMlWtCKyLm8ADUWxmIfxlrQJMsunrfdGZgivTa1mMAhDwvQdg5mVlQS1SvZJcX 8l1pw7acn0XxFBX7VufgP58qTzDvIFkH+DkWUrxo7ZcwZczsUVONNSyjs5Von15ZtPDw lEDYY9r6k/hoHFHYPTfU0sHtC3HJyWDZhIj+oGOPHU5htD9Cn9V4eOQ6pdDgbPVZMzGv VZ3A== X-Gm-Message-State: ALoCoQmrp8nlisn9EFJ09oPPRc40Cxos1/70+ZfUY5yiRzsPjRk3GOHFdG1oQ70fhdk6SMYL0kml X-Received: by 10.68.135.233 with SMTP id pv9mr51813514pbb.115.1432663514661; Tue, 26 May 2015 11:05:14 -0700 (PDT) Received: from tharvey.gw (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by mx.google.com with ESMTPSA id he9sm13712269pbc.7.2015.05.26.11.05.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 May 2015 11:05:14 -0700 (PDT) From: Tim Harvey To: Stefano Babic Date: Tue, 26 May 2015 11:04:55 -0700 Message-Id: <1432663498-24367-3-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432663498-24367-1-git-send-email-tharvey@gateworks.com> References: <1432663498-24367-1-git-send-email-tharvey@gateworks.com> Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/5] imx: ventana: make model env var automatic and non-overridable 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" We want to model env var to always reflect what was in the EEPROM. There is no point in allowing a user to override this. Signed-off-by: Tim Harvey --- board/gateworks/gw_ventana/gw_ventana.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index ae3cc84..e3737d1 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -685,8 +685,7 @@ int misc_init_r(void) memset(str, 0, sizeof(str)); for (i = 0; i < (sizeof(str)-1) && info->model[i]; i++) str[i] = tolower(info->model[i]); - if (!getenv("model")) - setenv("model", str); + setenv("model", str); if (!getenv("fdt_file")) { sprintf(fdt, "%s-%s.dtb", cputype, str); setenv("fdt_file", fdt); @@ -827,10 +826,6 @@ int ft_board_setup(void *blob, bd_t *bd) printf(" Set display timings for %s...\n", display); } - if (!model) { - puts("invalid board info: Leaving FDT fully enabled\n"); - return 0; - } printf(" Adjusting FDT per EEPROM for %s...\n", model); /* board serial number */