From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 08/15] rpi: barebox: migrate defaultenv from /env/config to nv variables
Date: Tue, 15 Sep 2020 20:59:13 +0200 [thread overview]
Message-ID: <20200915185920.3353-8-rhi@pengutronix.de> (raw)
In-Reply-To: <20200915185920.3353-1-rhi@pengutronix.de>
All upstream defaultenvs were converted in barebox 2015.01.0 [2]
to use nv variables instead of /env/config, and /env/config is no longer
sourced by the init script since barebox 2019.06.0 [1].
The default defaultenv already contains our variable definitions for
allow_color, user, and autoboot_timeout, and the information in
linux.bootargs.base is detected automatically as linux.bootargs.console
from the port name given by the serial driver and CONFIG_BAUDRATE in the
barebox config, so we don't have to convert those. This leaves
boot.default, and converting this variable should also fix the issue of
barebox trying to boot from net (instead of SD card) by default.
[1]: 2019-02-25, Sascha Hauer: "defaultenv: Convert init script to C",
https://git.pengutronix.de/cgit/barebox/commit/?id=90df2a955e3c66fee2c5
[2]: 2014-11-06, Sascha Hauer: "defaultenv-2: Make use of nonvolatile variables",
https://git.pengutronix.de/cgit/barebox/commit/?id=7962e7a0b423a5dfba25
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../platform-rpi/barebox-defaultenv/config | 19 -------------------
.../barebox-defaultenv/nv/boot.default | 1 +
2 files changed, 1 insertion(+), 19 deletions(-)
delete mode 100644 configs/platform-rpi/barebox-defaultenv/config
create mode 100644 configs/platform-rpi/barebox-defaultenv/nv/boot.default
diff --git a/configs/platform-rpi/barebox-defaultenv/config b/configs/platform-rpi/barebox-defaultenv/config
deleted file mode 100644
index 411e0540ee00..000000000000
--- a/configs/platform-rpi/barebox-defaultenv/config
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# change network settings in /env/network/eth0
-# change mtd partition settings and automountpoints in /env/init/*
-
-# set to false if you do not want to have colors
-global.allow_color=true
-
-# user (used for network filenames)
-global.user=none
-
-# timeout in seconds before the default boot entry is started
-global.autoboot_timeout=3
-
-# default boot entry (one of /env/boot/*)
-global.boot.default=sd
-
-# base bootargs
-global.linux.bootargs.base="console=ttyAMA0,115200"
diff --git a/configs/platform-rpi/barebox-defaultenv/nv/boot.default b/configs/platform-rpi/barebox-defaultenv/nv/boot.default
new file mode 100644
index 000000000000..e1476cfc2044
--- /dev/null
+++ b/configs/platform-rpi/barebox-defaultenv/nv/boot.default
@@ -0,0 +1 @@
+sd
--
2.28.0
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev parent reply other threads:[~2020-09-15 18:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 18:59 [DistroKit] [PATCH 01/15] PTXdist: migrate 2020.08.0 -> 2020.09.0 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 02/15] strace: remove local version bump Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 03/15] iproute2: document upstream fix for our local fork Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 04/15] mips: kernel: version bump 5.6.2 -> 5.8.9 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 05/15] rpi: " Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 06/15] rpi: install kernel into /boot so that barebox can find it Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 07/15] rpi: barebox: version bump 2018.03.0 -> 2020.08.1 Roland Hieber
2020-09-15 18:59 ` Roland Hieber [this message]
2020-09-15 18:59 ` [DistroKit] [PATCH 09/15] doc: rpi: mention that Raspberry Pi Zero W is also supported Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 10/15] v7a: kernel: version bump 5.8 -> 5.8.9 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 11/15] v7a: images: add more helpful kconfig help texts Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 12/15] v7a: barebox: version bump 2020.06.0 -> 2020.08.1 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 13/15] v7a: image-vexpress: slim down image Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 14/15] v8a: kernel: version bump 5.8 -> 5.8.9 Roland Hieber
2020-09-15 18:59 ` [DistroKit] [PATCH 15/15] x86_64: kernel: version bump 5.6.2 " Roland Hieber
2020-09-17 18:44 ` [DistroKit] [PATCH 01/15] PTXdist: migrate 2020.08.0 -> 2020.09.0 Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200915185920.3353-8-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox