9
0
Fork 0
Commit Graph

29 Commits

Author SHA1 Message Date
Sascha Hauer c6abd61fa8 Merge branch 'master' into next 2011-06-20 09:08:13 +02:00
Jan Weitzel 21536365bb update: add xload
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>
2011-06-11 10:53:04 +02:00
Teresa Gamez af2649b795 Check return values of erase and tftp/cp
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>
2011-06-10 08:25:32 +02:00
Jean-Christophe PLAGNIOL-VILLARD 9eac282024 defaultenv: add kernel_loc nfs and tftp support
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>
2011-03-14 11:57:11 +01:00
Juergen Beisert 1194e279d6 Generic environment: Fix assembling of the 'mtdparts' variable
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>
2011-03-03 16:15:51 +01:00
Marc Kleine-Budde c5dd4c4d0a defaultenv/bin/update: fix return values
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>
2011-02-07 22:10:28 +01:00
Marc Kleine-Budde 86ddd55dda defaultenv/bin/boot: fix ubi root's name assignment
This patch fixes a regression introduced in commit
d15cfafeef.

While there, use "-z" to check if ubiroot variable is empty.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-By: Eric Bnard<eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-02-03 09:56:47 +01:00
Sascha Hauer b82f0d4c09 Merge branch 'defenv' into next 2011-01-21 10:33:33 +01:00
Sascha Hauer 19c0219d4e defaultenv: do not print usage information for update script
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>
2011-01-21 10:32:47 +01:00
Sascha Hauer 2f0109b1bb Merge branch 'master' into next 2011-01-17 09:43:40 +01:00
Wolfram Sang e7d81285c8 defaultenv: make 'boot' work from subdirs
Wrong pathnames prevented that.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-10 12:33:17 +01:00
Eric Bénard fe2eb54612 update: add bareboxenv update possibility
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>
2011-01-08 13:26:48 +01:00
Eric Bénard ec604a5448 defaultenv/bin/update: let /env/config set default values
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>
2011-01-08 13:26:48 +01:00
Eric Bénard d15cfafeef defaultenv/bin/boot: make ubi root's name configurable
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>
2011-01-08 13:26:48 +01:00
Eric Bénard 22ef325692 _update_help: fix script name
$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>
2011-01-08 13:26:48 +01:00
Sascha Hauer 4d7bef86e2 defaultenv: only try to add partitions when partition description exists
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-21 16:43:40 +01:00
Jean-Christophe PLAGNIOL-VILLARD 7e0982bdc2 defaultenv/udpate: in xmodem mode load the data before erasing
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>
2010-11-29 21:55:25 +01:00
Jean-Christophe PLAGNIOL-VILLARD a75df244b2 defaultenv/udpate: fix typo in default barebox image name
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-29 21:55:25 +01:00
Sascha Hauer 508fd118f2 defaultenv: fix mtdparts
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>
2010-10-22 19:32:10 +02:00
Sascha Hauer 94e30f2ee3 defaultenv: do not overwrite bootargs variable
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-21 14:56:16 +02:00
Jean-Christophe PLAGNIOL-VILLARD bbdb7f4e3d defaultenv: add update_barebox to update barebox easly via tftp or xmodem
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-12 21:32:45 +02:00
Jean-Christophe PLAGNIOL-VILLARD de1823f74e defaultenv: add xmodem support for update
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>
2010-10-12 21:32:45 +02:00
Jean-Christophe PLAGNIOL-VILLARD 3b8942faa0 defaultenv/update: add check crc32 options
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-12 21:32:45 +02:00
Jean-Christophe PLAGNIOL-VILLARD 5c3538f44d defaultenv/update: merge update_rootfs and update_kernel
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>
2010-10-12 21:32:44 +02:00
Sascha Hauer 234efee7a9 defaultenv: handle disk partitions
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-11 13:22:14 +02:00
Marc Kleine-Budde eb9b2f8781 defaultenv: create /dev/ram0.kernel at offset 8M
otherwise uImages won't boot.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-08-25 11:08:22 +02:00
Marc Kleine-Budde 1707064e6e defaultenv: fix adding of nand_parts
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>
2010-08-25 11:08:22 +02:00
Marc Kleine-Budde 5baf768b51 defaultenv: fix physmap-flash device name
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>
2010-08-25 11:08:22 +02:00
Sascha Hauer c56830349b add a generic default environment
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>
2010-06-22 15:44:44 +02:00