From 7962e7a0b423a5dfba251622f64d3891f69a55c0 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 6 Nov 2014 09:56:43 +0100 Subject: 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 --- arch/arm/boards/embedsky-e9/defaultenv-e9/config-board | 7 ------- arch/arm/boards/embedsky-e9/defaultenv-e9/init/bootsource | 7 +++++++ arch/arm/boards/embedsky-e9/defaultenv-e9/nv/hostname | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 arch/arm/boards/embedsky-e9/defaultenv-e9/config-board create mode 100644 arch/arm/boards/embedsky-e9/defaultenv-e9/init/bootsource create mode 100644 arch/arm/boards/embedsky-e9/defaultenv-e9/nv/hostname (limited to 'arch/arm/boards/embedsky-e9') diff --git a/arch/arm/boards/embedsky-e9/defaultenv-e9/config-board b/arch/arm/boards/embedsky-e9/defaultenv-e9/config-board deleted file mode 100644 index 6cba769921..0000000000 --- a/arch/arm/boards/embedsky-e9/defaultenv-e9/config-board +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# board defaults, do not change in running system. Change /env/config -# instead - -global.hostname=e9 -global.boot.default=$bootsource$bootsource_instance diff --git a/arch/arm/boards/embedsky-e9/defaultenv-e9/init/bootsource b/arch/arm/boards/embedsky-e9/defaultenv-e9/init/bootsource new file mode 100644 index 0000000000..42a0c5c2bf --- /dev/null +++ b/arch/arm/boards/embedsky-e9/defaultenv-e9/init/bootsource @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -n "$nv.boot.default" ]; then + exit +fi + +global.boot.default=$bootsource$bootsource_instance diff --git a/arch/arm/boards/embedsky-e9/defaultenv-e9/nv/hostname b/arch/arm/boards/embedsky-e9/defaultenv-e9/nv/hostname new file mode 100644 index 0000000000..0c1945ad57 --- /dev/null +++ b/arch/arm/boards/embedsky-e9/defaultenv-e9/nv/hostname @@ -0,0 +1 @@ +e9 -- cgit v1.2.3