summaryrefslogtreecommitdiffstats
path: root/defaultenv
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Merge branch 'defenv' into nextSascha Hauer2011-01-211-6/+3
|\
| * defaultenv: do not print usage information for update scriptSascha Hauer2011-01-211-3/+0
| | | | | | | | | | | | | | | | | | This usage printout during startup more looks like there is something wrong with the environment than a helpful message. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Eric BĂ©nard <eric@eukrea.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * defaultenv: only try to add partitions when partition description existsSascha Hauer2010-12-211-3/+3
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'master' into nextSascha Hauer2011-01-171-2/+2
|\ \
| * | defaultenv: make 'boot' work from subdirsWolfram Sang2011-01-101-2/+2
| |/ | | | | | | | | | | | | Wrong pathnames prevented that. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | update: add bareboxenv update possibilityEric BĂ©nard2011-01-082-1/+7
| | | | | | | | | | | | | | this is useful when building barebox without integrated env. Signed-off-by: Eric BĂ©nard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv/bin/update: let /env/config set default valuesEric BĂ©nard2011-01-081-2/+2
| | | | | | | | | | | | | | | | this patch allows for example device_type to be fixed in /env/config (useful for configurations with only one memory type). Signed-off-by: Eric BĂ©nard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | defaultenv/bin/boot: make ubi root's name configurableEric BĂ©nard2011-01-081-1/+4
| | | | | | | | | | | | | | | | all root are not named root so give the possibility to configure this in the config file. Signed-off-by: Eric BĂ©nard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | _update_help: fix script nameEric BĂ©nard2011-01-081-1/+1
|/ | | | | | | | $0 is _update_help so update -h leads to : usage: /env/bin/_update_help so don't use $0 but hardcode update instead. Signed-off-by: Eric BĂ©nard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/udpate: in xmodem mode load the data before erasingJean-Christophe PLAGNIOL-VILLARD2010-11-291-1/+8
| | | | | | | and abort the update if loadb failed or cancelled Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/udpate: fix typo in default barebox image nameJean-Christophe PLAGNIOL-VILLARD2010-11-291-1/+1
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: fix mtdpartsSascha Hauer2010-10-221-1/+1
| | | | | | | | We had some \" in mtdparts to allow for spaces in the mtdparts kernel option. Barebox does not handle these correctly, so remove them and disallow spaces in mtdparts Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: do not overwrite bootargs variableSascha Hauer2010-10-211-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: add update_barebox to update barebox easly via tftp or xmodemJean-Christophe PLAGNIOL-VILLARD2010-10-122-1/+7
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: add xmodem support for updateJean-Christophe PLAGNIOL-VILLARD2010-10-123-13/+31
| | | | | | | the default mode is tftp to do not change the default behavior Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/update: add check crc32 optionsJean-Christophe PLAGNIOL-VILLARD2010-10-122-4/+12
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/update: merge update_rootfs and update_kernelJean-Christophe PLAGNIOL-VILLARD2010-10-126-37/+54
| | | | | | | use getopt to simplify it and prepare for xmodem support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: handle disk partitionsSascha Hauer2010-10-111-0/+4
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: create /dev/ram0.kernel at offset 8MMarc Kleine-Budde2010-08-251-1/+1
| | | | | | | otherwise uImages won't boot. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: fix adding of nand_partsMarc Kleine-Budde2010-08-251-1/+1
| | | | | | | Really add nand_parts if nand_parts are set, not nor_parts. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv: fix physmap-flash device nameMarc Kleine-Budde2010-08-251-1/+1
| | | | | | | | The first physmap-flash device is called "physmap-flash.0" (like zero), not "physmap-flash.o" (like in oops). Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* add a generic default environmentSascha Hauer2010-06-226-0/+214
We have several nearly identical default environments in the tree. Lets merge them to a single environment and use it on many boards. This defaultenv is arm centric at the moment due to the use of arm specific boot commands. This can be improved over time. changes since last version: - fix potentially empty variable tests - be a bit more verbose in boot script - run a board specific init script (/env/bin/init_board) if it exists Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>