summaryrefslogtreecommitdiffstats
path: root/defaultenv-2
Commit message (Collapse)AuthorAgeFilesLines
* move defaultenv-2 to defaultenv/defaultenv-2-*Sascha Hauer2014-02-2121-493/+0
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* console: Set Linux console parameter automaticallySascha Hauer2014-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | Linux specifies the linux,stdout-path property in the /chosen node in the devicetree. Unfortunately this is ignored in most cases. For cases in which barebox uses this property for its own use we translate this into a Linux boot arg with: - the console name provided by the serial driver - the the instance from the 'serial' alias - the baudrate from the actual baudrate. So with this it's for devicetee enabled boards no longer necessary to manually assign a console= parameter. Should a user not want to use the automatically assigned parameter it should do: global.linux.bootargs.console= in the environment. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/misc'Sascha Hauer2013-10-071-6/+13
|\ | | | | | | | | Conflicts: commands/Makefile
| * defenv-2: Do not overwrite previously existing global variablesSascha Hauer2013-09-301-6/+13
| | | | | | | | | | | | | | In case board code has already initialized global variables during init do not overwrite them. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/login'Sascha Hauer2013-10-071-0/+18
|\ \ | | | | | | | | | | | | Conflicts: include/console.h
| * | defaultenv-2: add login supportJean-Christophe PLAGNIOL-VILLARD2013-09-191-0/+18
| |/ | | | | | | | | | | | | | | | | | | request password to login is a timeout is specified and /env/etc/passwd present ensure we have not console access execpt when allowed Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / defenv-2: replace boot script with commandSascha Hauer2013-09-304-136/+0
|/ | | | | | | | This replaces the 'boot' script in the defaultenv-2 with a command with the same behaviour. A command gives more flexibility for future externsions Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: Fix settings entrySteffen Trumtrar2013-05-231-1/+1
| | | | | | | | There is no "settings-entries-edit" command. This results in a recursive call to the settings menu. Use the missing "boot-entries-edit" command instead. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/misc'Sascha Hauer2013-05-062-7/+12
|\
| * defaultenv-2: init: display prompt after running /env/init/*Jan Luebbe2013-04-241-6/+6
| | | | | | | | | | | | | | | | This allows init scripts to print messages to the console without messing up the timeout prompt. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * defaultenv-2: net: use oftree when existingSascha Hauer2013-04-181-1/+6
| | | | | | | | | | | | | | | | For booting with devicetree we had to adjust /env/boot/net manually. Instead, test if a devicetree exists and if yes, use it. This makes for a better default. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv-2: Fix verbose bootingSascha Hauer2013-04-181-1/+1
|/ | | | | | | | During option parsing we use the variable BOOT_BOOTMOPTS, all other scripts use BOOT_BOOTM_OPTS though. Fix this by using the same variable everywhere. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/misc'Sascha Hauer2013-04-042-5/+22
|\
| * defaultenv-2: move settings in a submenuJean-Christophe PLAGNIOL-VILLARD2013-03-152-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be more clear so on the mainmenu we will just have - the boot option - settings - shell - reset when starting to have a long list of boot option the menu start to be big Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv-2: don't load nonexistent fileVicente Bergas2013-03-111-1/+1
|/ | | | | Signed-off-by: Vicente Bergas <vicencb@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: add boot sequenceJean-Christophe PLAGNIOL-VILLARD2013-03-055-31/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to boot a sequence of boot entries until one succeeds. boot sources can be passed in $global.boot.default, which is now treated as a list. Also a list of boot entries can be specified as arguments to the boot script. The entries can be: - a plain filename from /env/boot/ - a full path to an arbitrary file - a directory containing boot entries With this this command: boot net nand-ubi /env/boot.d would first use the /env/boot/net entry, if this fails the /env/boot/nand-ubi entry and if this also fails the files from /env/boot.d/ (which could also be links to boot scripts) To make the above the default, global.boot.default would be specified as: global.boot.default="net nand-ubi /env/boot.d" Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/misc'Sascha Hauer2013-03-042-4/+5
|\
| * defenv2: comment setting default values in /env/configFabio Porcedda2013-02-261-4/+4
| | | | | | | | | | | | | | | | | | | | There is no need to set again default values in /env/config because they are already set in /env/bin/init, that allows /env/config-board to change those default values without being overwritten by /env/config. Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * defenv2: move config-board out of /env/initSascha Hauer2013-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | Having the board config file in /env/init has the problem that the settings in /env/config are overwritten in the init sequence. This moves the config-board files to /env/ and sources them explicitly from /env/bin/init before sourcing /env/config Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv-2: fix base/init/ps1: don't reload /env/configFabio Porcedda2013-02-211-2/+0
|/ | | | | | | | | | Remove the load of /env/config because is already done by /bin/init, so it doesn't overwrite any changes done by previous /init/* scripts that are loaded by /bin/init. Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: move ps1 to base/init/ps1Jean-Christophe PLAGNIOL-VILLARD2013-01-212-6/+9
| | | | | | | so we can overwrite it Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: execute init/* before timeoutJean-Christophe PLAGNIOL-VILLARD2013-01-161-2/+10
| | | | | | | so we can have splash, usb serial, etc... Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defenv-2 menu: when booting failed wait for key pressSascha Hauer2012-11-011-1/+1
| | | | | | | | | When booting fails we will be immediately be back into the menu, so the error message can't be seen. Also, boot in verbose mode since in interactive mode the last bit of performance is not that necessary. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defenv-2: bring back /env/configSascha Hauer2012-11-017-40/+30
| | | | | | | | | | | | | | 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>
* defenv-2: remove some helper scriptsSascha Hauer2012-11-0111-140/+2
| | | | | | | | The added complexity of bootargs-ip-* and bootargs-root-* makes understanding defenv-2 more complicated. remove them and open code the scripts instead in their users. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defenv-2: remove initrd boot scriptSascha Hauer2012-11-011-17/+0
| | | | | | | This is mostly an example and does not have a real use, so remove it to not have it in each and every environment. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defenv-2: set username to 'none'Sascha Hauer2012-10-251-1/+1
| | | | | | | The current 'sha' setting, though admittedly very convenient for me, was never intended to be in mainline. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: boot: add missing space in error messageJan Luebbe2012-10-121-1/+1
| | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: eth0 add default global.dhcp.vendor_idJean-Christophe PLAGNIOL-VILLARD2012-10-021-0/+1
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* defaultenv-2: boot reset linux.bootargs.dyn. and bootm. globalvarJean-Christophe PLAGNIOL-VILLARD2012-09-141-0/+4
| | | | | | This is need for boot sequence to do not have the previous boot param. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* defaultenv-2: boot use global.linux.bootargs.dyn for dynamic globalvarJean-Christophe PLAGNIOL-VILLARD2012-09-1412-14/+15
| | | | | | | | linux.bootargs.dyn.* will be cleared at the beginning of boot This is need for boot sequence to do not have the previous boot param. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* defaultenv-2/ansi-colors: export color only if enableJean-Christophe PLAGNIOL-VILLARD2012-09-142-3/+5
| | | | | | | This will allow to do not check it everywhere Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* command/mount: add autodetection supportJean-Christophe PLAGNIOL-VILLARD2012-09-041-3/+3
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'for-next/defenv-2'Sascha Hauer2012-08-016-7/+102
|\
| * defaultenv-2: Add bootargs for booting from diskTeresa Gámez2012-07-261-0/+26
| | | | | | | | | | | | | | Add support in defaultenv-2 for booting from disk (SD-Card, USB-Stick). Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * defenv-2: improve boot scriptSascha Hauer2012-07-051-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add usage information - add option parsing: -v verbose -v -v more verbose -l list b´possible boot sources -d dryrun The dryrun option sets the global variables necessary for booting but does not actually boot the system. This way it is possible to make additional adjustments to the boot variables and then invoke bootm manually. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * defenv-2: Add usage information for bootargs scriptsSascha Hauer2012-07-054-4/+37
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Add bootargs script to boot on ext filesystemsMaxime Ripard2012-07-041-0/+12
|/ | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Brian Lilly <brian@crystalfontz.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2 ifup: create network up state file for dhcpSascha Hauer2012-06-301-2/+5
| | | | | | | | We store the 'up' status of a network device in /tmp/network/$interface. Create this file for dhcp aswell to prevent doing dhcp requests each time ifup is called. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: remove global.tftp.pathSascha Hauer2012-06-304-9/+7
| | | | | | | | | | This variable is set in /env/init/general and then used in /env/boot/* which is a bit confusing. Also it does not necessarily have to be a tftp path (could be nfs aswell). Use a local variable in the scripts using it instead to make the meaning a bit more clear. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: mount tftp server specified in $eth0.serveripSascha Hauer2012-06-302-9/+4
| | | | | | | | | This is always the tftp server specified in /env/network/eth0, this could be either the one returned from a dhcp request or a manually specified one, but in the end it's always the right one. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2 ifup: Always overwrite eth0.serveripSascha Hauer2012-06-301-1/+6
| | | | | | | | | if serverip is specified, also overwrite eth0.serverip in dhcp case. This makes it possible to specify a different serverip when the dhcp server returns the wrong ip (because the DHCP might be a DSL router which does not provide tftp). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: automount script: run mount only when ifup succeedsSascha Hauer2012-05-231-4/+4
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Add next generation default environment templateSascha Hauer2012-05-1831-0/+538
This adds a new environment template which aims to be more flexible and configurable. Instead of having mainly two scripts (a config script and a boot script) this template uses initscripts which control the startup behaviour and configuration. Also we have boot scripts in /env/boot which configure a single boot configuration. Additional boot entries can be added by board specific entries or during runtime by copying and editing a template entry. Some more helpers handle for example network interfaces which can now be brought up with 'ifup'. We use the automount feature to configure mountpoints together with the commands to bring up the devices behind these mountpoints. Optionally menu support is available which hides many details behind a nice looking interface. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 07:41:38 +0000