summaryrefslogtreecommitdiffstats
path: root/common
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'spi' of git://git.denx.de/u-boot-x86Tom Rini2013-03-201-4/+4
|\
| * sf: Use unsigned type for buffersSimon Glass2013-03-191-4/+4
| | | | | | | | | | | | The verify code is broken on archs with signed char. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini2013-03-183-1/+91
|\ \ | |/ |/|
| * usb:gadget: USB Mass Storage Gadget supportLukasz Majewski2013-03-182-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the USB Mass Storage Gadget to u-boot New command called "ums" is implemented to provide access to on-device embedded persistent memory. USB Mass Storage is supposed to work on top of the USB Gadget framework Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> CC: Marek Vasut <marek.vasut@gmail.com>
| * dfu: Fix crash when wrong number of arguments givenPantelis Antoniou2013-03-161-1/+1
| | | | | | | | | | | | | | Fix obvious crash when not enough arguments are given to the dfu command. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
| * dfu: Only perform DFU board_usb_init() for TRATSPantelis Antoniou2013-03-161-0/+3
| | | | | | | | | | | | USB initialization shouldn't happen for all the boards. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-03-188-4/+112
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Albert's rework of the linker scripts conflicted with Simon's making everyone use __bss_end. We also had a minor conflict over README.scrapyard being added to in mainline and enhanced in u-boot-arm/master with proper formatting. Conflicts: arch/arm/cpu/ixp/u-boot.lds arch/arm/cpu/u-boot.lds arch/arm/lib/Makefile board/actux1/u-boot.lds board/actux2/u-boot.lds board/actux3/u-boot.lds board/dvlhost/u-boot.lds board/freescale/mx31ads/u-boot.lds doc/README.scrapyard include/configs/tegra-common.h Build tested for all of ARM and run-time tested on am335x_evm. Signed-off-by: Tom Rini <trini@ti.com>
| * Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-03-152-3/+5
| |\
| | * led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_setOtavio Salvador2013-03-071-2/+4
| | | | | | | | | | | | | | | | | | | | | This fixes the gpio_led driver which needs to compare againt a STATUS_LED_ON to enable a led. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| | * common: cmd_sata: Fix usage text for 'sata init'Fabio Estevam2013-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently sata usage text prints a double 'sata' for the init command. MX53LOCO U-Boot > sata sata - SATA sub system Usage: sata sata init - init SATA sub system sata info - show available SATA devices sata device [dev] - show or set current device sata part [dev] - print partition table sata read addr blk# cnt sata write addr blk# cnt Remove the extra 'sata' from the 'sata init' line. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | Refactor linker-generated arraysAlbert ARIBAUD2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor linker-generated array code so that symbols which were previously linker-generated are now compiler- generated. This causes relocation records of type R_ARM_ABS32 to become R_ARM_RELATIVE, which makes code which uses LGA able to run before relocation as well as after. Note: this affects more than ARM targets, as linker- lists span possibly all target architectures, notably PowerPC. Conflicts: arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds arch/arm/cpu/armv7/omap-common/u-boot-spl.lds board/ait/cam_enc_4xx/u-boot-spl.lds board/davinci/da8xxevm/u-boot-spl-da850evm.lds board/davinci/da8xxevm/u-boot-spl-hawk.lds board/vpac270/u-boot-spl.lds Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
| * | Merge u-boot/master into u-boot-ti/masterTom Rini2013-03-1130-585/+905
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>
| * | | lcd: implement a callback for splashimageNikita Kiryanov2013-03-111-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some architectures certain values of splashimage will lead to a data abort exception. Document the problem, and implement a callback for splashimage to reject such values. Cc: Anatolij Gustschin <agust@denx.de> Cc: Wolfgang Denk <wd@denx.de> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * | | SPL: ONENAND: Support SPL to boot u-boot from OneNAND.Enric Balletbo i Serra2013-03-113-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch will allow use SPL to boot an u-boot from the OneNAND. Tested with IGEPv2 board with a OneNAND from Numonyx Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> [trini: Add <spl.h> hunk to fix warning] Signed-off-by: Tom Rini <trini@ti.com>
| * | | lcd: add option for board specific splash screen preparationNikita Kiryanov2013-03-081-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no logical place to put the code that prepares the splash image data. The splash image data should be ready in memory before bmp_display() is called, and after the environment is ready (since lcd.c looks for the splash image in an address specified by the environment variable "splashimage"). Our window of opportunity in board_init_r() is therefore: between env_relocate() and bmp_display(), and from the available options only the lcd related functions in drv_lcd_init() seem appropriate for such lcd oriented code. Add the option to prepare the splash image data in lcd_logo() right before it is sent to be displayed. Cc: Anatolij Gustschin <agust@denx.de> Cc: Jeroen Hofstee <jeroen@myspectrum.nl> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
| * | | mmc: add support for write protectionNikita Kiryanov2013-03-081-0/+7
| | |/ | |/| | | | | | | | | | | | | | | | Add generic mmc write protection functionality. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
| * | spl: support for booting via usbethIlya Yanok2013-02-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | In case of usbeth booting just call net_load_image("usb_ether"). This patch also adds CONFIG_SPL_USBETH_SUPPORT and CONFIG_SPL_MUSB_NEW_SUPPORT config options to enable linking of SPL against USB gagdet support and new MUSB driver resp. Signed-off-by: Ilya Yanok <ilya.yanok@cogentembedded.com>
* | | x86: Enable generic board supportSimon Glass2013-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | | This enables generic board support so that x86 boards can define CONFIG_SYS_GENERIC_BOARD. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | x86: Adjust board_r.c for x86Simon Glass2013-03-151-2/+21
| | | | | | | | | | | | | | | | | | | | | For x86 the global_data is managed entirely by the start.S code so we do not need to touch it. However, we do have some more initcalls to add. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | x86: Adjust board_f.c for x86Simon Glass2013-03-151-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For x86, things have adjusted somewhat since this series was originally written. It has its own way of running through initcalls which is actually nicer than others archs. Unfortunately this does introduce exceptions. We will soon require use of generic board on x86, but until then we need to fit in with what is there, and treat x86 as a special case. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Adjust board_r.c for ppcSimon Glass2013-03-151-3/+477
| | | | | | | | | | | | | | | | | | This adds ppc features to the generic post-relocation board init. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Adjust board_f.c for ppcSimon Glass2013-03-151-2/+332
| | | | | | | | | | | | | | | | | | | | | | | | This adds ppc features to the generic pre-relocation board init. This is a separate commit so that these features are clearly shown. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Add CONFIG_SYS_SYM_OFFSETS to support offset symbolsSimon Glass2013-03-151-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link symbols as created by the link script can either be absolute or relative to the text start. This option switches between the two options so that we can support both. As we convert architectures over to generic board, we can see if this option is actually needed, or whether it is possible to unify this feature also. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Add spl load featureSimon Glass2013-03-151-0/+13
| | | | | | | | | | | | | | | | | | This adds secondary program loader support to the generic board. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Introduce generic post-relocation board_r.cSimon Glass2013-03-152-0/+423
| | | | | | | | | | | | | | | | | | | | | This file handles common post-relocation init for boards which use the generic framework. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Introduce generic pre-relocation board_f.cSimon Glass2013-03-152-0/+582
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file handles common pre-relocation init for boards which use the generic framework. It starts up the console, DRAM, performs relocation and then jumps to post-relocation init. Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Wolfgang Denk <wd@denx.de> Acked-by: Wolfgang Denk <wd@denx.de>
* | | cmd_mem.c: Fix warning when CONFIG_CMD_MEMTEST is not setTom Rini2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | mem_test_quick and mem_test_alt functions are only called by do_mem_mtest, so move them under the #ifdef Signed-off-by: Tom Rini <trini@ti.com>
* | | CONFIG_BOOTDELAY default should not affect runtimeJoe Hershberger2013-03-121-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the code that handles bootdelay is compiled in conditionally based on the default value, you are restricted in the default, regardless of what you want the runtime options to be. Change the source to always check if any default is given so that other values can be selected and used at runtime. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* | | common/main: move set_working_fdt_addr to enable usage of $fdtaddrBarak Wasserstrom2013-03-121-4/+4
| | | | | | | | | | | | | | | | | | | | | When using $fdtaddr in $bootcmd and $bootcmd is automatically called, $fdtaddr is yet not defined. Signed-off-by: Barak Wasserstrom <wbarak@gmail.com>
* | | env: fix "env ask" commandWolfgang Denk2013-03-121-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "env ask" traditionally uses a somewhat awkward syntax: env ask name [message ...] [size] So far, when a mesage was given, you always also had to enter a size. If you forgot to do that, the command would terminate without any indication of the problem. To avoid incompatible changes of the interface, we now check the last argument if it can be converted into a decimal number. If this is the case, we assume it is a size; otherwise we treat it as part of the message. Also, add a space after the message fore easier reading, and clean up help mesage. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | cmd_fat.c: Note in fatread help about alignment requirementsTom Rini2013-03-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | When using the partial read feature of fatwrite the buffer we read into can become unaligned not just due to initial location but the size of our partial reads as well. Make this clear in the help text. Signed-off-by: Tom Rini <trini@ti.com>
* | | cmd_df.c: Delete this clearly unused source file.Robert P. J. Day2013-03-111-36/+0
| | | | | | | | | | | | | | | | | | Nothing appears to use or compile cmd_df.c anymore. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* | | cmd_mtdparts.c: Correct "reseting" to "resetting" in error msgsRobert P. J. Day2013-03-111-3/+3
| | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* | | Allow u-boot to be silent without forcing Linux to beJoe Hershberger2013-03-111-4/+4
| | | | | | | | | | | | | | | | | | That's a bit presumptuous of you, u-boot! Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* | | cmd_part: don't print cmd name twice in helpStephen Warren2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core implementation of "help" already prints the command name before the help text of a specific command. Remove it from part's own help text to avoid it being printed twice: Tegra114 (Dalmore) # help part part - disk partition related commands Usage: part part uuid <interface> <dev>:<part> - print partition UUID ... Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | | Feature Removal: disable "mtest" command by defaultWolfgang Denk2013-03-111-1/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "mtest" command is of little practical use (if any), and experience has shown that a large number of board configurations define useless or even dangerous start and end addresses. If not even the board maintainers are able to figure out which memory range can be reliably tested, how can we expect such from the end users? As this problem comes up repeatedly, we rather do not enable this command by default, so only people who know what they are doing will be confronted with it. As this changes the user interface, we allow for a grace period before this change takes effect. For now, we make "mtest" configurable through the CONFIG_CMD_MEMTEST variable, which is defined in include/config_cmd_default.h; we also add an entry to doc/feature-removal-schedule.txt which announces the removal of this default setting in two releases from now, i. e. with v2013.07. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Tom Rini <trini@ti.com>
* | bootm: fix conditional compilation for bootm ramdisk subcommandDaniel Schwierzeck2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | All code related to the bootm ramdisk subcommand is conditionally enabled by CONFIG_SYS_BOOT_RAMDISK_HIGH except for the help message. Replace the CONFIG_ARCH defines by CONFIG_SYS_BOOT_RAMDISK_HIGH to fix this. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
* | env: Avoid clobbering an edited variable on ctrl-cJoe Hershberger2013-03-041-1/+2
| | | | | | | | | | | | If readline says there was an error, don't write to the variable! Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* | sandbox: Add 'sb' command to access filesystem featuresSimon Glass2013-03-042-0/+64
| | | | | | | | | | | | | | | | | | The new 'sb' command is intended to deal with sandbox-specific features that have no parallel in other archs. This commit adds two sub-commands to list a directory and read a file from the host filesystem. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@ti.com>
* | Merge branch 'mem' of git://git.denx.de/u-boot-x86Tom Rini2013-03-0421-553/+612
|\ \
| * | hash: Use lower case for hash algorithm namesSimon Glass2013-02-282-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than use strcasecmp() in the hash algorithm search, require the caller to do this first. Most of U-Boot can use lower case anyway, and the hash command can convert to lower case before calling hash_command(). This saves needing strcasecmp() for boards that use hashing but not the hash command. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | sandbox: Allow hash functions to work correctlySimon Glass2013-02-281-8/+16
| | | | | | | | | | | | | | | | | | Use map_sysmem() so that hashing is possible on sandbox. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | sandbox: Update mtest to fix crashesSimon Glass2013-02-281-45/+63
| | | | | | | | | | | | | | | | | | | | | Use map_sysmem() in the memory tester so that it works as expected on sandbox. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | Move CONFIG_SYS_MEMTEST_SCRATCH #ifdef to top of fileSimon Glass2013-02-281-4/+4
| | | | | | | | | | | | | | | | | | | | | This config effectively has a default value of 0, so add this setting at the top of the code to remove an #ifdef in the C function. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | Roll crc32 into hash infrastructureSimon Glass2013-02-282-106/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the CRC32 algorithm to the list of available hashes, and make the crc32 command use hash_command(). Add a new crc32_wd_buf() to make this possible, which puts its result in a buffer rather than returning it as a 32-bit value. Note: For some boards the hash command is not enabled, neither are sha1, sha256 or the verify option. In this case the full hash implementation adds about 500 bytes of overhead. So as a special case, we use #ifdef to select very simple bahaviour in that case. The justification for this is that it is currently a very common case (virtually all boards enable crc32 but only some enable more advanced features). Signed-off-by: Simon Glass <sjg@chromium.org>
| * | hash: Add a flag to support saving hashes in the environmentSimon Glass2013-02-283-24/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some hashing commands permit saving the hash in an environment variable, and verifying a hash from there. But the crc32 command does not support this. In order to permit crc32 to use the generic hashing infrastructure, add a flag to select which behaviour to use. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | image: Use crc header file instead of C prototypesSimon Glass2013-02-281-2/+2
| | | | | | | | | | | | | | | | | | We have an existing header which the crc32 definitions, so use it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | common: Use new numeric setenv functionsSimon Glass2013-02-2815-71/+48
| | | | | | | | | | | | | | | | | | Use setenv_ulong(), setenv_hex() and setenv_addr() in common/ Signed-off-by: Simon Glass <sjg@chromium.org>
| * | Update set_working_fdt_addr() to use setenv_addr()Simon Glass2013-02-282-13/+6
| | | | | | | | | | | | | | | | | | | | | We might as well use this common function instead of repeating the same code. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | Reduce casting in mtestSimon Glass2013-02-281-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | Use a ulong for the command arguments, and only cast to an address when needed. This fixes warnings in sandbox where pointers are typically 64 bits long. Signed-off-by: Simon Glass <sjg@chromium.org>
OpenPOWER on IntegriCloud