diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-06 09:56:43 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-06 12:23:12 +0100 |
| commit | 7962e7a0b423a5dfba251622f64d3891f69a55c0 (patch) | |
| tree | e16edaaec63ba1b50a3e672cb33473d0aecd7231 /arch/arm/boards/clep7212 | |
| parent | 32e879f0a3e984ae319f8438af6ac240911a4cbf (diff) | |
| download | barebox-7962e7a0b423a5dfba251622f64d3891f69a55c0.tar.gz barebox-7962e7a0b423a5dfba251622f64d3891f69a55c0.tar.xz | |
defaultenv-2: Make use of nonvolatile variables
This moves the variable assignments previously done in /env/config-board
to non volatile variables in /env/nv/. This makes the settings adjustable
by the user without editing a file.
Most of the changes are simple conversions which for many boards makes
/env/config-board unnecessary. Some boards had some logic to assign
global.boot.default based on the current bootsource. This has been
moved to /env/init/bootsource. An additional check is added to not
overwrite a nv.boot.default should it exist.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/clep7212')
| -rw-r--r-- | arch/arm/boards/clep7212/env/config-board | 12 | ||||
| -rw-r--r-- | arch/arm/boards/clep7212/env/init/bootsource | 9 | ||||
| -rw-r--r-- | arch/arm/boards/clep7212/env/nv/autoboot_timeout | 1 | ||||
| -rw-r--r-- | arch/arm/boards/clep7212/env/nv/linux.bootargs.base | 1 |
4 files changed, 11 insertions, 12 deletions
diff --git a/arch/arm/boards/clep7212/env/config-board b/arch/arm/boards/clep7212/env/config-board deleted file mode 100644 index f7a8f60e25..0000000000 --- a/arch/arm/boards/clep7212/env/config-board +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Timeout in seconds before the default boot entry is started -global.autoboot_timeout=2 - -# Default boot entry (one of /env/boot/*) -if [ -e /dev/nor0 ]; then - global.boot.default=nor -fi - -# Board bootargs -global.linux.bootargs.base="earlyprintk console=ttyCL0,57600n8" diff --git a/arch/arm/boards/clep7212/env/init/bootsource b/arch/arm/boards/clep7212/env/init/bootsource new file mode 100644 index 0000000000..2f09c0cef5 --- /dev/null +++ b/arch/arm/boards/clep7212/env/init/bootsource @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ -n "$nv.boot.default" ]; then + exit +fi + +if [ -e /dev/nor0 ]; then + global.boot.default=nor +fi diff --git a/arch/arm/boards/clep7212/env/nv/autoboot_timeout b/arch/arm/boards/clep7212/env/nv/autoboot_timeout new file mode 100644 index 0000000000..0cfbf08886 --- /dev/null +++ b/arch/arm/boards/clep7212/env/nv/autoboot_timeout @@ -0,0 +1 @@ +2 diff --git a/arch/arm/boards/clep7212/env/nv/linux.bootargs.base b/arch/arm/boards/clep7212/env/nv/linux.bootargs.base new file mode 100644 index 0000000000..77ea2ecf0f --- /dev/null +++ b/arch/arm/boards/clep7212/env/nv/linux.bootargs.base @@ -0,0 +1 @@ +earlyprintk console=ttyCL0,57600n8 |