From patchwork Thu May 2 19:09:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Darko Komljenovic' via swupdate X-Patchwork-Id: 1094524 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::240; helo=mail-lj1-x240.google.com; envelope-from=swupdate+bncbdsmnwxtyuprbnmbvxtakgqeyga4d6y@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=googlegroups.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="Im5jywkb"; dkim-atps=neutral Received: from mail-lj1-x240.google.com (mail-lj1-x240.google.com [IPv6:2a00:1450:4864:20::240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44w4bv1JKMz9s9G for ; Fri, 3 May 2019 05:10:49 +1000 (AEST) Received: by mail-lj1-x240.google.com with SMTP id e2sf582936lja.16 for ; Thu, 02 May 2019 12:10:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556824245; cv=pass; d=google.com; s=arc-20160816; b=vK3LqLA6+8jZWn5Ohf+saiM0m5wvSPiILiZJZlthDqQbnqMkdKKmcurS4WJBR3p2SI WxKQazXtMnAVw5+w/eEywEZTS7yHBqI8rLu8kM8anHo3v9F10hqnFTo5VnHB9s6HyZ+h rMXcMogRf+CndQf+1CYNqGod3PQk7u6k5HJfdkNNlzkzoqkNMnbzzxlIaDm5C1hcPB2u qPZNSzDgqD4aJszF76DAlSgPHdMkwpvbiqMywgv1Hl1AmSl5rUjznZiniJm7lwKwCovs 6s5YV49KPPsBUr37eoEXwwVXV2wGS1AeCdF4keZ+M2eGPgg8d1lGfbHJJdZlNoyO/zct 7fiQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:message-id:date:subject:cc :to:from:mime-version:dkim-signature; bh=8v+2jEh2qllr3SIygKaKSL277xPbUoIoA/zfuM1/a6U=; b=eBJmpGKVx4x2yn5uqUafEYzg73NFXYt+alBuYYBM+8dVz+UYvxTqKia0uK0aT4lXyK XRILa97qYj0ZHEXf/VzruFVEWEfZYA7PrUgZartL1pJPMdzahXCmQC+rmUzlw47RjP0a KT2AJl4/JZDVIgJR77Swl5PI9LOCfnu3UcBpalTl7gQwsCF0OFTIvsbbO7+9Wr8mL8qc EpDTPHNl2lPDGksyoIDSb3gm2nDVt38iGoxwIznrKvtnpv4pyajwpI+hbiPnbqt8psr9 esVc1a/tgQi5G11fha5e1Bzmh2KAFFeEyazoGEuf6Fg2QydjcaJqgsFUVEhbaMfeOOCf GsgA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@koncepto.io header.s=default header.b=E3wp9tXw; spf=pass (google.com: domain of pjtexier@koncepto.io designates 195.154.119.111 as permitted sender) smtp.mailfrom=pjtexier@koncepto.io; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=koncepto.io DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=mime-version:from:to:cc:subject:date:message-id:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:list-subscribe :list-unsubscribe; bh=8v+2jEh2qllr3SIygKaKSL277xPbUoIoA/zfuM1/a6U=; b=Im5jywkbwgnP0qS09M+YG7otwfH7IDnrEM8eSRcYFbcvXKInFx8tWuT77CqXcVn60Q p/uLfyLJKNU907E1WybAuXrpiouSMoncU8NLBSlA8Pylh1RYaxeADZ3sGyU+ejmw64PK xIz9Ru1m/5tT432M6A7E94IYeiKBAAD4qNYoYK3/g62VcGooKPFGRRc9giIPTEwwBflk Jy79jlGLkakuPv+C6AZ777zEoOLVhUSl51vMKBd/c/rrkuTuwDQdYZzCEgDdRFQ5SqUx JFqRR8e3uZFj+BTCyV10kU1S5pwUqSIc7bViD7cRQtZw0GblWELp9gUpIoctc6/de6e7 lTMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=8v+2jEh2qllr3SIygKaKSL277xPbUoIoA/zfuM1/a6U=; b=L/VpAzIqsdX6XEC0UaaJxZ2Q52jI6vt0zb9i04u9j8uY4IrzKJBcRauW8P5QZCNSzW ShJ4Bh+tuCG0K8BlfZf6jRFi1zBoPlK3hUSaF9NaUHVVg9pE+Df9NUFpH/xyiUOw7Bbw ZY04ugxTSn//w/8USCBlPqWD5jh0wV1QyLWuOZ6o+ufr0M3/x/8LiLLtmxd0gm8nQIXb J+7LfJN0xJ2+WSAGMWYRA7CtRMo6LfUYhybmsCMMLuhCEJ2yRTOFkJp2wjr1LjIxaoZN wZVO7ZT5UqSLl/aTmVOJt9MPrSDdCHOhNxKnOAWaOuedWYZKCGD046TgT6bO049ji0jQ AfDw== X-Gm-Message-State: APjAAAXpXN//JkR0YJWaDwHg4ikwS92DuS1qRRQJ/EgyD/voZQH3GHmd 1/5KIn/IOxAlqYHV6/U28Vc= X-Google-Smtp-Source: APXvYqxgovdmKLcAlpVDbIDGT4nrhmdB4IxLiawquUAZ/osIGtkUf5qYUiChY35ekUxeBB8qmIeC9A== X-Received: by 2002:a2e:9c85:: with SMTP id x5mr2893619lji.45.1556824245743; Thu, 02 May 2019 12:10:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a19:f807:: with SMTP id a7ls286315lff.11.gmail; Thu, 02 May 2019 12:10:45 -0700 (PDT) X-Received: by 2002:a19:6911:: with SMTP id e17mr2772681lfc.5.1556824245203; Thu, 02 May 2019 12:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556824245; cv=none; d=google.com; s=arc-20160816; b=NiKWttoSsHAXxUpVoY6WBYjFERQeAu11j3fcx95V6wH7EgmOBCEANou6B4/DGso+Hp cQodQoVbTuceyl8n0oL416+p1kTEagTu0Ni375DGkAf0BxS/69F0j/omZl+JLrI/EG1g C4ZOSsUHmSPhi64ZeCTP2Yr5bIattLaV0lL2/qyASkKxnBgdl5rBhj1CffSgotyTIHbR na3TefZfqmeQ3qwqpH7beZ/sF1ox/tds8bntr0U0uQenqn/Y+hjWeqgmYP3TbuDu+FRv Fkyw8l/tFJXxjB2QKnLvCveLqwJfzjCxIUsxMDXgo8SyCcyVTpKQXtMydOnsryb7lYi/ AGrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=8Bi9GihKCiAZEluXSpNaW6jpi3kfDc03NZZHZR8ytwQ=; b=Hmum/K1u4BM1Y8BL5ggWIG1g44IDeGS8wXHZ+GZtnMAhR+GdZ9DwJgV9U4N64z97wN KLRCJnTaNRMjlo8lpItQ6yPEY7iW2jk6JpATh8ZnrttNsJoKB4o9zt9dW/2Wq3yHbQUY EBUs/cOmin1DBpBy03RGlzANCCklh+6UKn0hDGCiKWQSWeCbHPTDK2WJH4ykSMK07GQ2 uFJYQi5P5EybCd9bPRiLNeouvXaRh1l8Yl0m826Imfkf/4SoHOqsC+IeNfbEUuF/uf2d 7L6z7CnRFHQ7ddgwrcu5edrI+kQ7YjI+rkTIoFFNJS4NBdZMtuCx9yz28rFB7uvHJ1Y7 sKNQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@koncepto.io header.s=default header.b=E3wp9tXw; spf=pass (google.com: domain of pjtexier@koncepto.io designates 195.154.119.111 as permitted sender) smtp.mailfrom=pjtexier@koncepto.io; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=koncepto.io Received: from koncepto.io (koncepto.io. [195.154.119.111]) by gmr-mx.google.com with ESMTPS id j7si5826ljc.0.2019.05.02.12.10.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 12:10:45 -0700 (PDT) Received-SPF: pass (google.com: domain of pjtexier@koncepto.io designates 195.154.119.111 as permitted sender) client-ip=195.154.119.111; Received: from localhost.localdomain (lfbn-1-8938-37.w193-250.abo.wanadoo.fr [193.250.79.37]) by koncepto.io (Postfix) with ESMTPSA id 428C8600D2; Thu, 2 May 2019 21:10:44 +0200 (CEST) X-Patchwork-Original-From: "'Pierre-Jean Texier' via swupdate" From: 'Darko Komljenovic' via swupdate To: swupdate@googlegroups.com Cc: Pierre-Jean Texier Subject: [swupdate] [libubootenv][PATCH v2] fw_printenv: set 'u-boot-initial-env' file as default Date: Thu, 2 May 2019 21:09:40 +0200 Message-Id: <1556824180-12894-1-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 X-Original-Sender: pjtexier@koncepto.io X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@koncepto.io header.s=default header.b=E3wp9tXw; spf=pass (google.com: domain of pjtexier@koncepto.io designates 195.154.119.111 as permitted sender) smtp.mailfrom=pjtexier@koncepto.io; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=koncepto.io X-Original-From: Pierre-Jean Texier Reply-To: Pierre-Jean Texier Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Since commit [1] in U-Boot, this is the file with the initial environment delivered with the bootloader. So, let's set this name as default. ted with buildroot as follows: 1) # fw_printenv Cannot read environment, using default baudrate=115200 ... 2) # fw_setenv foo bar Cannot read environment, using default 3) # fw_printenv foo foo=bar [1] https://github.com/u-boot/u-boot/commit/bdaa73a5b3923257add182b4ab8058dbfa33421b#diff-b67911656ef5d18c4ae36cb6741b7965 Signed-off-by: Pierre-Jean Texier --- Changes v1 -> v2: - fix commit log src/fw_printenv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/fw_printenv.c b/src/fw_printenv.c index 361d150..5f75db7 100644 --- a/src/fw_printenv.c +++ b/src/fw_printenv.c @@ -121,6 +121,9 @@ int main (int argc, char **argv) { exit (ret); } + if (!defenvfile) + defenvfile = "/etc/u-boot-initial-env"; + if ((ret = libuboot_open(ctx)) < 0) { fprintf(stderr, "Cannot read environment, using default\n"); if ((ret = libuboot_load_file(ctx, defenvfile)) < 0) {