From patchwork Thu May 2 19:04:27 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: 1094517 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::440; helo=mail-wr1-x440.google.com; envelope-from=swupdate+bncbdsmnwxtyuprbax7vttakgqecum33li@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="QT2VAw6+"; dkim-atps=neutral Received: from mail-wr1-x440.google.com (mail-wr1-x440.google.com [IPv6:2a00:1450:4864:20::440]) (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 44w4Tz6yfMz9s9G for ; Fri, 3 May 2019 05:05:42 +1000 (AEST) Received: by mail-wr1-x440.google.com with SMTP id z7sf3335033wrh.4 for ; Thu, 02 May 2019 12:05:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1556823939; cv=pass; d=google.com; s=arc-20160816; b=OzU5VvKADygtH4eRN/ZfidoZF64BHQ99QksW5IN1ZQ3Gux69g/8xS/OVCKNReAFvtG RWmvXBARPDF5nQzUx5hw7yySTtF0vCrcmavLS61+1VMth7mQXvR+ifBSspeHqEPLr1Yw dsrQ7SWljzTt1q89BUMo0t89Hz6rMn9WFdLY4C9FkKUBbUWPEhH7e9ih5MZaFHl/aODs cxZoK6OJ21gVNqW+e3DeZ9Ds91YqyGl99D4n0KL8wGf8JuXgQQxvTNfDVSl/GQPNY7v4 ySkBm9L0SfYd3WPzH5ORQdRI7ya6vq/4I5D7hBJAY5VrJ5wEcwuXZSeB9bl4dsifbUyR w9ug== 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=ZZfTW2ouycRjZgGH7dZuHvJQ8VjlLZ3xAPHeRI7p7HY=; b=L3n3ioMyDhusmGDT6Bc8ZYA1uPXgjn0GV+wCjWsQeu2Fu0e+udxuMknsPhhEFkUEOS nkYUPRGivLTZWUJDTWlHz75iB609NBhNAKD0l1EsBqCkMiFoqfR32cTNoex2ZL6d0zcJ WNvSoA7RVR8iq7n+X8lB+lK4cRHv98p8/zgPUT4VQEItUzteWwkWyhJZtJETRpOGWCJN +Vu4ZfcWGHbcyuIfczoWPGK9yodSdJhS+XQ/CD/PisqDO0m4GJ7SFpOC/gmTKSNldDnR LmR8+r72X2Za5H6jWfq8NOLjoj7M6GtFV9S+G/CKWC5L4+SJfcosC44gtk4KrH4XlqdW N44A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@koncepto.io header.s=default header.b=elAMvvaY; 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=ZZfTW2ouycRjZgGH7dZuHvJQ8VjlLZ3xAPHeRI7p7HY=; b=QT2VAw6+uc1X6tKs9HRKFy18fKOxVHpsLgG5KD4zmBChO9cmESh3p7z3EM5/BWc5w7 uS4E2nB1W6LfKARE9OAN6d2wHc0H7DVOu299vhX9iBOgHc6GscFqn2QPFKArmhVrzssJ rKaDp3DUg0Jon2aYbGUkn9oKDCctb66tNeh0MH36bxNTDkmBb4zhjxclT7KEflK3/hrN fIxFnpQs9W6YGpijec66jxtUiKHfIDJkgeTgaaVBbI+UYKgw1lawonqWRF5Nu2Ctrl75 Sw8zvuW6VJHfmdwDz9qM8cJF2RxwQ4hNzLaHf02D86WbSeMQbUBygHwgY6XcCU781RqT 1AAA== 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=ZZfTW2ouycRjZgGH7dZuHvJQ8VjlLZ3xAPHeRI7p7HY=; b=RtTeZQf+sabsfcOgsnpFY6PuWDHLS7phBvXpPTuFO8/VEWnhKccje9UkJIYeizcfp5 mcQ36S4VQHx+2sgFy+MnubD0pRHiaLXrkCpy+cyxkOybCJaOTNtFkrcGsJrLit9K4sap eqCWe0ooseFkKulOpMCFPkiDh3OuAUgB5CY1FsjoOcW/drkf67lXekYu3R1ncBMpLRaP 8081cnNJRvvBY/XDm0DSe+CW2cltSIF3t7d3XqhDfFZ+ChlXR8tztHu6iV6z0rtUWIUa dfvVoCnciTKyBptVshsZUyH9IiBWbYcwTntxvO2Rozoiw48QbbQQHMrBwcP5y27kywWd CKvA== X-Gm-Message-State: APjAAAV52DctrDHgQnFykzOW5uubHWAYQLzpeH/18wbCbeBNDNfBzgM9 dCZlK7PSRtudcN2yKfdXeO8= X-Google-Smtp-Source: APXvYqy1rLUEMFhDYpOXLJXoF1QIufJr4BlypB0W/GpQ44F2+Z8+PiqYmmj1A4l/jDEzxj+GuyFF9w== X-Received: by 2002:a7b:c405:: with SMTP id k5mr3365730wmi.153.1556823938902; Thu, 02 May 2019 12:05:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:8083:: with SMTP id 3ls769026wrl.9.gmail; Thu, 02 May 2019 12:05:38 -0700 (PDT) X-Received: by 2002:adf:ef8c:: with SMTP id d12mr429384wro.320.1556823938165; Thu, 02 May 2019 12:05:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556823938; cv=none; d=google.com; s=arc-20160816; b=caBX4Y0WzaBsgv2LstWtlRS5eH4hHcQHbTPmta3tZFjXg8jR3oU+pAazza576JK+J/ 4oDZXg1MzIJaKyJKf90ceO7FdvAwdUDaquUF/dzYgHv8FFBWNCz62oaRorBKLD2V7jII D1B+r+KAR1et6L7y1HHsKEadBBgRqD4VJgO7mjdF7VfUnvAggXl3R+/dd3R22O++4GeI l/s1A7CoWFWsKCi44YHPcnPMkweG2q2NTRie8kTdiVGJzN+V4VSUXSSK+6lVWq2UmMcL jhBs8SKKdeb+NMSQqgs2IOlg7KF4HaXzTTaudQex02gz3Clonl9FWemYrl2baicm78r5 SW1g== 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=Gvj25mnwKZkt1VcVvWQXplMl8LhIkmbC/qL/99rxwcU=; b=rbRGMd6ACheKJLlTI5xf9JLPzsSAS7NOdQxKNWwrrzxWRmtkKZ+pL81TXRJpGI8D5r JQfoeaQcD7L7YUTe63/UicUlziVJO7EDgY/5VYx1rL8VZ3uFEnxVprxIYyl7+x+NJUrI DCWlUpq7LxfVXctcLY+ojsGfPQ9/CBcwbbsDMGsEKMxu0a0F5wSa4YcYvquGanLP5NAM MTShlOBejZHwukETH0rSFVlTwEscPH6VJYLIPMon+Og6+pg2ef181LMok4SEMOzYmRJ9 3+E4PJXfBXSF+PMEyqVRebj/Y7sfLx8sT61OV0hlO4vcYMiS8UByz+JGU6WzytpukkYy sruw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@koncepto.io header.s=default header.b=elAMvvaY; 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 t1si9059wmh.0.2019.05.02.12.05.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 12:05:38 -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 B6D73600D2; Thu, 2 May 2019 21:05:37 +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] fw_printenv: set 'u-boot-initial-env' file as default Date: Thu, 2 May 2019 21:04:27 +0200 Message-Id: <1556823867-11911-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=elAMvvaY; 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. Tested with Buildroot as follows: Cannot read environment, using default baudrate=115200 ... Cannot read environment, using default foo=bar [1] https://github.com/u-boot/u-boot/commit/bdaa73a5b3923257add182b4ab8058dbfa33421b#diff-b67911656ef5d18c4ae36cb6741b7965 Signed-off-by: Pierre-Jean Texier --- 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) {