summaryrefslogtreecommitdiffstats
path: root/defaultenv
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* defaultenv: boot: add backwards compatibility for kernel_loc=netMarc Kleine-Budde2011-09-261-0/+4
| | | | | | | | | | Since commit 9eac282024c55fc13970189d6ace61f884917538, the boot script doesn't understand kernel_loc=net anymore. This patch adds backwards compatibility so that the kernel is loaded from tftp as before. 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: simplify scriptingMarc Kleine-Budde2011-09-262-5/+5
| | | | | | 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>
* Merge branch 'master' into nextSascha Hauer2011-06-201-3/+3
|\
| * Check return values of erase and tftp/cpTeresa Gamez2011-06-101-3/+3
| | | | | | | | | | | | | | | | | | The _update script does not check the return value of erasing a partiton or flashing the image to the device. Added this check to get a evaluable return value from the update script. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | update: add xloadJan Weitzel2011-06-112-1/+4
|/ | | | | | | | add xload as vaild update type. Default name should be stored in enviroment variable "xloadimage" Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: add kernel_loc nfs and tftp supportJean-Christophe PLAGNIOL-VILLARD2011-03-141-5/+8
| | | | | | | | | | before we can only support tftp so keep it as default Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Patrice Vilchez <patrice.vilchez@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Generic environment: Fix assembling of the 'mtdparts' variableJuergen Beisert2011-03-031-2/+5
| | | | | | | | | | | | The semicolon is a delimiter, not an end marker. With a trailing semicolon the kernel give the confusing message: mtd: no mtd-id With this patch, a semicolon gets added on demand only. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/bin/update: fix return valuesMarc Kleine-Budde2011-02-071-1/+3
| | | | | | | | | | | | This patch fixes the return values of the update script. - Exit with an error of the "_update" script fails. - Add a "else; true" to the crc check, otherwise the script exits with "1". Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/bin/boot: fix ubi root's name assignmentMarc Kleine-Budde2011-02-031-2/+2
| | | | | | | | | | | This patch fixes a regression introduced in commit d15cfafeef8f99ff1a47e77362d0adf1b07f26ae. While there, use "-z" to check if ubiroot variable is empty. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-By: Eric Bénard<eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 22:01:32 +0000