diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-01 14:46:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-01 19:46:40 +0100 |
| commit | d78597af84d1481af8cd68c5ec31487c0892cb93 (patch) | |
| tree | 4a8e476ff2fbdb73ce790d7dbaf1af287962d736 /arch/arm/boards/crystalfontz-cfa10036 | |
| parent | fee5d94b9ab10fc4c7c0890384bd368681f4a0f6 (diff) | |
| download | barebox-d78597af84d1481af8cd68c5ec31487c0892cb93.tar.gz barebox-d78597af84d1481af8cd68c5ec31487c0892cb93.tar.xz | |
defenv-2: bring back /env/config
The idea of having /env/init/* scripts was to make the configuration
more flexible and customizable for boards. It turned out though that
people (including myself) do not find the place where they should
change these settings.
So this patch brings back /env/config for defenv-2. The individual
env/init/* scripts are removed and their content is added to
/env/init/config-board. This makes the values from /env/init/config-board
the board specific defaults which can be overwritten in /env/config.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/crystalfontz-cfa10036')
3 files changed, 7 insertions, 16 deletions
diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/init/bootargs-base b/arch/arm/boards/crystalfontz-cfa10036/env/init/bootargs-base deleted file mode 100644 index 4dda5501e3..0000000000 --- a/arch/arm/boards/crystalfontz-cfa10036/env/init/bootargs-base +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Base bootargs" - exit -fi - -global.linux.bootargs.base="console=ttyAMA0,115200" diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/init/config-board b/arch/arm/boards/crystalfontz-cfa10036/env/init/config-board new file mode 100644 index 0000000000..b99866ecfe --- /dev/null +++ b/arch/arm/boards/crystalfontz-cfa10036/env/init/config-board @@ -0,0 +1,7 @@ +#!/bin/sh + +# board defaults, do not change in running system. Change /env/config +# instead + +global.hostname=cfa10036 +global.linux.bootargs.base="console=ttyAMA0,115200" diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/init/hostname b/arch/arm/boards/crystalfontz-cfa10036/env/init/hostname deleted file mode 100644 index 1dbe346fdf..0000000000 --- a/arch/arm/boards/crystalfontz-cfa10036/env/init/hostname +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "hostname" - exit -fi - -global.hostname=cfa10036 |