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/at91sam9m10ihd | |
| 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/at91sam9m10ihd')
5 files changed, 3 insertions, 27 deletions
diff --git a/arch/arm/boards/at91sam9m10ihd/env/config b/arch/arm/boards/at91sam9m10ihd/env/config deleted file mode 100644 index db2713c19a..0000000000 --- a/arch/arm/boards/at91sam9m10ihd/env/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=android - -# base bootargs -#global.linux.bootargs.base="console=ttyS0,115200" diff --git a/arch/arm/boards/at91sam9m10ihd/env/init/config-board b/arch/arm/boards/at91sam9m10ihd/env/init/config-board deleted file mode 100644 index 32c107130b..0000000000 --- a/arch/arm/boards/at91sam9m10ihd/env/init/config-board +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# board defaults, do not change in running system. Change /env/config -# instead - -global.hostname=at91sam9m10ihd -global.linux.bootargs.base="console=ttyS0,115200" -global.boot.default=android diff --git a/arch/arm/boards/at91sam9m10ihd/env/nv/boot.default b/arch/arm/boards/at91sam9m10ihd/env/nv/boot.default new file mode 100644 index 0000000000..7473a25129 --- /dev/null +++ b/arch/arm/boards/at91sam9m10ihd/env/nv/boot.default @@ -0,0 +1 @@ +android diff --git a/arch/arm/boards/at91sam9m10ihd/env/nv/hostname b/arch/arm/boards/at91sam9m10ihd/env/nv/hostname new file mode 100644 index 0000000000..9361c5a04b --- /dev/null +++ b/arch/arm/boards/at91sam9m10ihd/env/nv/hostname @@ -0,0 +1 @@ +at91sam9m10ihd diff --git a/arch/arm/boards/at91sam9m10ihd/env/nv/linux.bootargs.base b/arch/arm/boards/at91sam9m10ihd/env/nv/linux.bootargs.base new file mode 100644 index 0000000000..476b1fbe49 --- /dev/null +++ b/arch/arm/boards/at91sam9m10ihd/env/nv/linux.bootargs.base @@ -0,0 +1 @@ +console=ttyS0,115200 |