summaryrefslogtreecommitdiffstats
path: root/defaultenv
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/misc'Sascha Hauer2015-03-091-2/+5
|\
| * defaultenv-2: init: don't call timeout again if the user intervenedMichael Olbrich2015-02-171-2/+5
| | | | | | | | | | | | | | | | | | With autoboot_timeout=0 the second 'timeout' might not get another character even if the user keeps a key pressed. So just reuse the key from the first call. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv-2: mtdparts-add: Use new partition parameterSascha Hauer2015-02-121-5/+4
| | | | | | | | | | | | | | mtd devices now have a partition parameter to create mtd partitions. Use it to simplify the mtdparts-add script. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv-2: mtdparts-add: remove unused variableSascha Hauer2015-02-121-3/+0
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mtd: nand: remove automatically created bb devicesSascha Hauer2015-02-121-3/+0
|/ | | | | | | | the bb devices which are created in add_mtd_device() must be removed in del_mtd_device(). Also remove deletion of the bb devices in the mtdparts-add environment file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: ignore barebox_zero_envMasahiro Yamada2015-02-111-0/+1
| | | | | | | | Since commit c4c2317fe8a2 (defaultenv: generate force-built-in (zero) environment file), we have this generated file. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: generate force-built-in (zero) environment fileJan Luebbe2015-02-041-1/+7
| | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* gitignore: move "barebox_default_env*" to subdirectoryMasahiro Yamada2015-02-021-0/+1
| | | | | | | | | | | | | | | | | "barebox_default_env*" is not "Top-level generic files" because they are generated in the defaultenv/ directory since commit 7fa10256c3f4 (defaultenv: Allow multiple defaultenvironment overlays). The comment block of the top-level .gitignore says as follows: # NOTE! Don't add files that are generated in specific # subdirectories here. Add them in the ".gitignore" file # in that subdirectory instead. Let's follow this rule. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv-2: Make use of nonvolatile variablesSascha Hauer2014-11-065-20/+8
| | | | | | | | | | | | | | 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>
* defaultenv: Reorder overlay append orderTeresa Gámez2014-09-111-2/+14
| | | | | | | | | | | | The defaultenv_add_base() functions adds the enviroment coming from CONFIG_DEFAULT_ENVIRONMENT_PATH. But this is not only for traditional enviroments, but also for external enviroments in e.g. build systems. The external enviroment should override the enviroment set in the board file and not the other way around. Made sure that external enviroment is always added last. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* remove unused boot-menu-add-entrySascha Hauer2014-06-233-15/+0
| | | | | | | The boot-menu-add-entry script no longer exists. Remove it from boot scripts. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/ifup'Sascha Hauer2014-05-051-0/+2
|\
| * default environment: force a specific return valueJuergen Borleis2014-04-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a162dfe50345d3461010759f8a0e79f7e388c140 the ifup command runs this file as a script. Due to a hush misbehave it could happen it returns an error code by accident. For example if the last instructions in this file are: if [ false ]; then echo "friesel" fi the hush returns 1 after running this script instead of 0 and in this case the ifup command fails. I know, the correct fix would be to fix the hush, because it is a generic issue...but how? Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mtd: nand: create bb devices automaticallySascha Hauer2014-04-282-5/+0
|/ | | | | | | | When a mtd device can have bad blocks we want to create a bb device, so do this automatically. This allows us to drop bb device creation from the environment. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defenv-2: replace menu with menutreeSascha Hauer2014-03-2828-149/+48
| | | | | | This makes the menu easier to extend and to maintain. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/nfs'Sascha Hauer2014-03-071-67/+0
|\ | | | | | | | | Conflicts: defaultenv/defaultenv-2-base/bin/ifup
* | defaultenv: Add boot option for DFUSascha Hauer2014-02-283-0/+42
| | | | | | | | | | | | | | | | | | | | | | DFU is for device firmware upgrade, but for development purposes it's sometmes useful to just start a kernel vie DFU. This adds a boot option for doing this and also the corresponding counterpart on the host. With this it's possible to boot a system with: scripts/dfuboot.sh -k linuximage -d dtb -c "root=ubi0:root ubi.mtd=ubi rootfstype=ubifs ignore_loglevel" Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv: Allow multiple defaultenvironment overlaysSascha Hauer2014-02-282-0/+172
| | | | | | | | | | | | | | | | | | | | We can compile barebox for multiple boards at once, but currently they all share a single default environment. This patch adds a defaultenv_append() which boards can call to customize the default environment during runtime. Each board now generate default environment snippets using bbenv-y and add them during runtime with defaultenv_append() Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | move defaultenv-2 to defaultenv/defaultenv-2-*Sascha Hauer2014-02-2121-0/+493
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | move defaultenv-1 to defaultenv/defaultenv-1Sascha Hauer2014-02-217-0/+0
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* dhcp: switch to global var supportJean-Christophe PLAGNIOL-VILLARD2012-10-022-7/+7
| | | | | | | | | | This way you can specify as previously set the dhcp parameter via global.dhcp.xxx and get the result via global.dhcp.xxx This is need for the defaultenv-2 to add the bootp suppport. Use it on defaultenv too to have only one set of var. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* defaultenv: switch hostname to global.hostnameJean-Christophe PLAGNIOL-VILLARD2012-10-021-8/+8
| | | | | | Udpate dhcp with it too. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* defaultenv: enable glovalvar supportJean-Christophe PLAGNIOL-VILLARD2012-10-021-0/+2
| | | | | | | This will allow to do not have 2 set of var for defaultenv and the new defaultenv-2. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* defaultenv/bin/init: skip autoboot if $autoboot_timeout is unsetJan Luebbe2012-06-301-1/+1
| | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: don't overwrite $user in configUwe Kleine-König2012-05-131-1/+3
| | | | | | | | | | | | | | | | | This patch prooved to be useful while working with a colleague on a single machine. It allows to switch the user without editing /env/config by just issuing: export user=me . Note, in bash this construct (i.e. an if without body) bails out with: Syntax error: "fi" unexpected but in hush it seems to do the right thing. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: remove now unnecessary hush-hackSascha Hauer2012-04-302-5/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: add binfmt supportJean-Christophe PLAGNIOL-VILLARD2012-04-181-0/+4
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* config: switch machine to hostnameJean-Christophe PLAGNIOL-VILLARD2012-04-181-9/+9
| | | | | | | So we can use it for dhcp request too. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/update: add oftree supportJean-Christophe PLAGNIOL-VILLARD2012-04-152-1/+7
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'master' into nextSascha Hauer2012-04-111-1/+1
|\
| * defaultenv/update: fix dhcp-barebox supportJean-Christophe PLAGNIOL-VILLARD2012-04-111-1/+1
| | | | | | | | | | | | | | call dhcp when ip mode is dhcp-barebox Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv: add support for custom board bootJean-Christophe PLAGNIOL-VILLARD2012-04-111-7/+11
| | | | | | | | | | | | | | | | This will allow a board to have a custom boot choice with a boot menu as example. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv: add support of oftree file pass via dhcp (option 224)Jean-Christophe PLAGNIOL-VILLARD2012-04-101-0/+3
| | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv/boot: add support for oftree boot option supportJean-Christophe PLAGNIOL-VILLARD2012-04-103-2/+20
|/ | | | | | | | you can now specify in the same way as it's done for the kernel where is stored the oftree. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: add dhcp-barebox optionJean-Christophe PLAGNIOL-VILLARD2012-03-172-2/+11
| | | | | | | | barebox will use DHCP and pass the result to the kernel update the help Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: add bootp supportJean-Christophe PLAGNIOL-VILLARD2012-03-171-3/+9
| | | | | | | | use rootpath as nfsroot and bootfile as kernelimage if present when ip mode is dhcp Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* net: dhcp: allow to set transmitted vendor idEnrico Scholz2012-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | For net boot setups it is useful to submit boot params like server or bootfile over dhcp. To distinguish barebox from e.g. pxe machines, a custom vendor id can be sent in dhcp discover/request messages. E.g. the ISC dhcp server can be configured with | if substring(option vendor-class-identifier,0,8) = "barebox:" { | next-server 192.168.3.24; | server-name "192.168.3.24"; | option tftp-server-name "192.168.3.24"; | option root-path = concat("/srv/sysroots/by-mac/", | binary-to-ascii (16, 8, "-", substring (hardware, 1, 6))); | } to sent boot params which are valid for barebox hosts only. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Jean-Christophe PLAGNIOL-VILLARD: - update the use dhcp command option - support to set the vendor via env dhcp_vendor_id Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/boot: add getopt option support to select boot modeJean-Christophe PLAGNIOL-VILLARD2012-02-142-5/+39
| | | | | | | | | | | | | | | | | | | | | | boot: boot [-m <mode>] [-k <kernel_option>] [-r <rootfs_option>] [-i <ip_mode>] options - kernel nand, nor, nfs, tftp, disk - rootfs nand, nor, net, disk - ip dhcp, none, empty mode option mode kernel rootfs nand nand nand nor nor nor nfs nfs net tftp fttp net disk disk disk default mode are used from the /env/config Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: update: add nfs supportMarc Kleine-Budde2012-01-253-13/+10
| | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: enable progress for cpJean-Christophe PLAGNIOL-VILLARD2012-01-041-1/+1
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: source the init_board so we can keep exported envJean-Christophe PLAGNIOL-VILLARD2012-01-041-1/+1
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: simplify bootSascha Hauer2011-12-152-44/+4
| | | | | | | | Now that we have a bootm command which boots everything we can simplify the defaultenvironment. We can call bootm on every image type and can remove the kernelimage_type variables. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* update configs and default envs for uncompressSascha Hauer2011-11-291-1/+1
| | | | | | | uncompress is the replacement for unlzo. Adjust environments and defconfigs accordingly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: add bootm_opt var to allow the board to pass parameter to bootmJean-Christophe PLAGNIOL-VILLARD2011-10-091-1/+1
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: place eth0.ethaddr more visiblyWolfram Sang2011-09-261-1/+3
| | | | | | | | | The config file looks like you just need to set ethaddr when you do static IP. This is misleading, so put the setting to a more prominent place. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: add config templateMarc Kleine-Budde2011-09-261-0/+67
| | | | | | | | This patch add a config template to the defaultenv. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: update: add support to update kernel on diskMarc Kleine-Budde2011-09-262-1/+4
| | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: boot: add support to boot from diskMarc Kleine-Budde2011-09-261-1/+8
| | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: boot: add serverip to static ip configurationMarc Kleine-Budde2011-09-261-1/+1
| | | | | | | | | If a (different) server is supplied to the "nfsroot" parameter, the kernel will choose that one. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: boot: add eth0 to ip configurationMarc Kleine-Budde2011-09-261-1/+1
| | | | | | | | | When passing a fixed IP to the kernel set it explicit to eth0. Otherwise on systems with more than one interface dhcp might be used. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 06:16:01 +0000