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/efika-mx-smartbook | |
| 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/efika-mx-smartbook')
6 files changed, 8 insertions, 29 deletions
diff --git a/arch/arm/boards/efika-mx-smartbook/env/config b/arch/arm/boards/efika-mx-smartbook/env/config deleted file mode 100644 index c63c6a1fa5..0000000000 --- a/arch/arm/boards/efika-mx-smartbook/env/config +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# change network settings in /env/network/eth0 -# change mtd partition settings and automountpoints in /env/init/* - -#global.hostname= - -# 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=1 - -# default boot entry (one of /env/boot/*) -# (if not overwritten here, the bootdevice barebox comes from -# is used) -#global.boot.default=net - -# base bootargs -global.linux.bootargs.base="console=tty1" - -# suitable for 800MHz -global linux.bootargs.lpj="lpj=3997696" - -# speed up booting by being more quiet -global linux.bootargs.quiet="quiet" diff --git a/arch/arm/boards/efika-mx-smartbook/env/init/bootsource b/arch/arm/boards/efika-mx-smartbook/env/init/bootsource index 380e85589b..eb98a3c5b6 100644 --- a/arch/arm/boards/efika-mx-smartbook/env/init/bootsource +++ b/arch/arm/boards/efika-mx-smartbook/env/init/bootsource @@ -1,5 +1,9 @@ #!/bin/sh +if [ -n "$nv.boot.default" ]; then + exit +fi + # by default pick kernel from MMC card if booting from # it, otherwise default to boot from internal harddisk diff --git a/arch/arm/boards/efika-mx-smartbook/env/nv/autoboot_timeout b/arch/arm/boards/efika-mx-smartbook/env/nv/autoboot_timeout new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/arch/arm/boards/efika-mx-smartbook/env/nv/autoboot_timeout @@ -0,0 +1 @@ +1 diff --git a/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.base b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.base new file mode 100644 index 0000000000..04415e6303 --- /dev/null +++ b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.base @@ -0,0 +1 @@ +console=tty1 diff --git a/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.lpj b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.lpj new file mode 100644 index 0000000000..e5c753e10e --- /dev/null +++ b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.lpj @@ -0,0 +1 @@ +lpj=3997696 diff --git a/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.quiet b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.quiet new file mode 100644 index 0000000000..2448b2c384 --- /dev/null +++ b/arch/arm/boards/efika-mx-smartbook/env/nv/linux.bootargs.quiet @@ -0,0 +1 @@ +quiet |