summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* integrator: enable device treeLinus Walleij2013-04-12-0/+1
| | | | | | | This enables the device tree library on the Integrator platforms so we can pass a device tree when booting. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* VCMA9: Enable CONFIG_CMD_NAND_YAFFSTom Rini2013-04-12-0/+1
| | | | | | | | As this board has NAND and supports YAFFS2, add CONFIG_MD_NAND_YAFFS Cc: David Müller <d.mueller@elsoft.ch> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: David Müller <d.mueller@elsoft.ch>
* Merge branch 'u-boot/master' into 'u-boot-arm/master'Albert ARIBAUD2013-04-12-2059/+7061
|\ | | | | | | | | Conflicts: drivers/video/exynos_fb.c
| * env: Add redundant env support to UBI envJoe Hershberger2013-04-11-0/+129
| | | | | | | | | | | | Allow the user to specify two UBI volumes to use for the environment Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * env: Add support for UBI environmentJoe Hershberger2013-04-11-2/+144
| | | | | | | | | | | | | | | | | | UBI is a better place for the environment on NAND devices because it handles wear-leveling and bad blocks. Gluebi is needed in Linux to access the env as an MTD partition. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * mtd: Make mtdparts work with pre-reloc envJoe Hershberger2013-04-11-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | The env in UBI needs to look up the mtd partition as part of relocation, which happens before relocation. Make the mtdparts code capable of working on the default env to start with. The code tries to set values in the env as well, but again, the env isn't there yet, so add a check to setenv to not allow sets before the env is relocated. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * ubi: ubifs: Turn off verbose printsJoe Hershberger2013-04-11-6/+29
| | | | | | | | | | | | The prints are out of control. SILENCE! Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * ubi: ubifs: Add documentation for READMEJoe Hershberger2013-04-11-0/+16
| | | | | | | | | | | | Describe the needed CONFIG tokens to enable UBI and UBIFS support. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * ubi: Expose a few simple functions from the cmd_ubiJoe Hershberger2013-04-11-67/+86
| | | | | | | | | | | | Part, Read, and Write functionality that will be used by env_ubi. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * ubi: Fix broken cleanup code in attach_by_scanningJoe Hershberger2013-04-11-4/+5
| | | | | | | | | | | | | | The unwind code was not reversing operations correctly and was causing a hang on any error condition. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * Do not call board_early_init_f() twiceVadim Bendebury2013-04-11-3/+0
| | | | | | | | | | | | | | | | | | | | | | Apparently due to a missed rebase conflict resolution board_early_init_f() is included twice in the list of initialization functions. Leave only the first occurrence. . built and boot an Exynos 5250 target Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
| * Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini2013-04-11-129/+681
| |\
| | * powerpc/usb: Fix usb device-tree fix-upramneek mehresh2013-04-10-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix USB device-tree fixup to properly handle device-tree fixup and print appropriate message when wrong/junk "dr_mode" or "phy_type" are mentioned in hwconfig string Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
| | * am335x_evm: Enable DFU for NAND and MMC, provide example alt_infosPantelis Antoniou2013-04-10-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add CONFIG_DFU_NAND, CONFIG_DFU_MMC - Set dfu_alt_info_nand, dfu_alt_info_emmc and dfu_alt_info_mmc to show working examples for those cases. - Increase CONFIG_SYS_MAXARGS due to hush parsing bugs that would otherwise disallow 'setenv dfu_alt_info ${dfu_alt_info_nand}'. - Enable CONFIG_FAT_WRITE to allow updating on MMC Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Tom Rini <trini@ti.com>
| | * am335x_evm: Add CONFIG_CMD_MTDPARTS and relevant defaultsTom Rini2013-04-10-0/+9
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| | * am335x_evm: Define CONFIG_SYS_CACHELINE_SIZEPantelis Antoniou2013-04-10-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | drivers/usb/gadget/composite.c requires that this is defined early. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Tom Rini <trini@ti.com>
| | * dfu: NAND specific routines for DFU operationPantelis Antoniou2013-04-10-0/+222
| | | | | | | | | | | | | | | | | | | | | | | | Support for NAND storage devices to work with the DFU framework. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Scott Wood <scottwood@freescale.com>
| | * cmd_nand.c: Fix CONFIG_CMD_NAND_YAFFSTom Rini2013-04-10-1/+1
| | | | | | | | | | | | | | | | | | | | | The flag changed from WITH_INLINE_OOB to WITH_YAFFS_OOB by accident in 418396e. Signed-off-by: Tom Rini <trini@ti.com>
| | * nand: Extend nand_(read|write)_skip_bad with *actual and limit parametersTom Rini2013-04-10-33/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We make these two functions take a size_t pointer to how much space was used on NAND to read or write the buffer (when reads/writes happen) so that bad blocks can be accounted for. We also make them take an loff_t limit on how much data can be read or written. This means that we can now catch the case of when writing to a partition would exceed the partition size due to bad blocks. To do this we also need to make check_skip_len count not just complete blocks used but partial ones as well. All callers of nand_(read|write)_skip_bad are adjusted to call these with the most sensible limits available. The changes were started by Pantelis and finished by Tom. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Tom Rini <trini@ti.com>
| | * dfu: Change indentation of defines in <dfu.h>Tom Rini2013-04-10-3/+3
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| | * dfu: Support larger than memory transfers.Pantelis Antoniou2013-04-10-91/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we didn't support upload/download larger than available memory. This is pretty bad when you have to update your root filesystem for example. This patch removes that limitation (and the crashes when you transfered any file larger than 4MB) by making raw image writes be done in chunks and making file maximum size be configurable. The sequence number is a 16 bit counter; make sure we handle rollover correctly. This fixes the wrong transfers for large (> 256MB) images. Also utilize a variable to handle initialization, so that we don't rely on just the counter sent by the host. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Tom Rini <trini@ti.com>
| | * README: Document current DFU CONFIG optionsTom Rini2013-04-10-0/+13
| | | | | | | | | | | | | | | | | | | | | Add documentation for the current DFU config options. DFU is a standard USB device class so more information is available from usb.org Signed-off-by: Tom Rini <trini@ti.com>
| * | powerpc/lib: fix unsafe register handling in wait_ticksMats Kärrman2013-04-10-6/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If watchdog is enabled, the arch/powerpc/lib/ticks.S::wait_ticks() function calls the function specified by the WATCHDOG_RESET macro. The wait_ticks function depends on the registers r0, r6 and r7 being preserved however that is not guaranteed, e.g. if the reset function is a C function this will probably overwrite r0 and cause an endless loop. The following patch changes to using r14+r15 instead of r6+r7 (to resemble what would have been generated by a C compiler) and saves all necessary registers on the stack. The patch has been tested on a custom MPC5125 based machine using the 512x powerpc architecture. Signed-off-by: Mats Karrman <mats.karrman@tritech.se> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Joakim Tjernlund <joakim.tjernlund@transmode.se> Tested-by: Stefan Roese <sr@denx.de>
| * patman: Add Series-process-log tag to sort/uniq change logsSimon Glass2013-04-08-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For some series with lots of changes it is annoying that duplicate change log items are not caught. It is also helpful sometimes to sort the change logs. Add a Series-process-log tag to enable this, which can be placed in a commit to control this. The change to the Cc: line is to fix a checkpatch warning. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| * patman: Add -a option to refrain from test-applying the patchesSimon Glass2013-04-08-3/+7
| | | | | | | | | | | | | | | | | | | | Especially with the Linux kernel, it takes a long time (a minute or more) to test-apply the patches, so patman becomes significantly less useful. The only real problem that is found with this apply step is trailing spaces. Provide a -a option to skip this step, for those working with clean patches. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| * patman: Don't barf if the word 'commit' starts a lineDoug Anderson2013-04-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | Patman's regular expression for detecting the start of a commit in a git log was a little simplistic and could be confused if the git log itself had the word "commit" as the start of a line (as this commit does). Make patman a little more robust. Signed-off-by: Doug Anderson <dianders@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
| * patman: Provide option to ignore bad aliasesSimon Glass2013-04-08-24/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Often it happens that patches include tags which don't have aliases. It is annoying that patman fails in this case, and provides no option to continue other than adding empty tags to the .patman file. Correct this by adding a '-t' option to ignore tags that don't exist. Print a warning instead. Since running the tests is not a common operation, move this to --test instead, to reserve -t for this new option. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| * Merge branch 'patman' of git://git.denx.de/u-boot-x86Tom Rini2013-04-08-121/+3829
| |\
| | * buildman - U-Boot multi-threaded builder and summary toolSimon Glass2013-04-04-0/+3030
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tool handles building U-Boot to check that you have not broken it with your patch series. It can build each individual commit and report which boards fail on which commits, and which errors come up. It also shows differences in image sizes due to particular commits. Buildman aims to make full use of multi-processor machines. Documentation and caveats are in tools/buildman/README. Signed-off-by: Simon Glass <sjg@chromium.org>
| | * patman: Ignore all Gerrit Commit-* tagsSimon Glass2013-04-04-1/+1
| | | | | | | | | | | | | | | | | | | | | These tags are used by Gerrit, so let's ignore all of them. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| | * patman: Minor help message/README fixesSimon Glass2013-04-04-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | A few of the help messages are not quite right, and there is a typo in the README. Fix these. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| | * patman: Fix the comment in CheckTags to mention multiple tagsSimon Glass2013-04-04-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This comment is less than helpful. Since multiple tags are supported, add an example of how multiple tags work. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| | * patman: Don't allow spaces in tagsSimon Glass2013-04-04-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present something like: Revert "arm: Add cache operations" will try to use Revert "arm as a tag. Clearly this is wrong, so fix it. If the revert is intended to be tagged, then the tag can come before the revert, perhaps. Alternatively the 'Cc' tag can be used in the commit messages. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| | * patman: Fix up checkpatch parsing to deal with 'CHECK' linesSimon Glass2013-04-04-62/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkpatch has a new type of warning, a 'CHECK'. At present patman fails with these, which makes it less than useful. Add support for checks, making it backwards compatible with the old checkpatch. At the same time, clean up formatting of the CheckPatches() output, fix erroneous "internal error" if multiple patches have warnings and be more robust to new types of problems. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| | * patman: Add Cover-letter-cc tag to Cc cover letter to peopleSimon Glass2013-04-04-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cover letter is sent to everyone who is on the Cc list for any of the patches in the series. Sometimes it is useful to send just the cover letter to additional people, so that they are aware of the series, but don't need to wade through all the individual patches. Add a new Cover-letter-cc tag for this purpose. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
| | * patman: Allow specifying the message ID your series is in reply toDoug Anderson2013-04-04-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of git don't seem to prompt you for the message ID that your series is in reply to. Allow specifying this from the command line. Signed-off-by: Doug Anderson <dianders@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
| | * patman: Make "Reviewed-by" an important tagDoug Anderson2013-04-04-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although "Reviewed-by:" is a tag that gerrit adds, it's also a tag used by upstream. Stripping it is undesirable. In fact, we should treat it as important. Signed-off-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Simon Glass <sjg@chromium.org>
| | * patman: Add additional git utiltiesSimon Glass2013-04-04-1/+123
| | | | | | | | | | | | | | | | | | | | | Add methods to find out the commits in a branch, clone a repo and fetch from a repo. Signed-off-by: Simon Glass <sjg@chromium.org>
| | * patman: Allow reading metadata from a list of commitsSimon Glass2013-04-04-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | We normally read from the current branch, but buildman will need to look at commits from another branch. Allow the metadata to be read from any list of commits, to provide this flexibility. Signed-off-by: Simon Glass <sjg@chromium.org>
| | * patman: Allow commands to raise on error, or notSimon Glass2013-04-04-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | Make raise_on_error a parameter so that we can control which commands raise and which do not. If we get an error reading the alias file, just continue. Signed-off-by: Simon Glass <sjg@chromium.org>
| | * patman: Make command methods return a CommandResultSimon Glass2013-04-04-24/+64
| | | | | | | | | | | | | | | | | | | | | | | | Rather than returning a list of things, return an object. That makes it easier to access the returned items, and easier to extend the return value later. Signed-off-by: Simon Glass <sjg@chromium.org>
| | * patman: Add cros_subprocess library to manage subprocessesSimon Glass2013-04-04-0/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new library on top of subprocess which permits access to the subprocess output as it is being generated. We can therefore give the illusion that a process is running independently, but still monitor its output so that we know what is going on. It is possible to display output on a terminal as it is generated (a little like tee). The supplied output function is called with all stdout/stderr data as it arrives. Signed-off-by: Simon Glass <sjg@chromium.org>
| | * patman: Use bright ANSI colours by defaultSimon Glass2013-04-04-8/+11
| | | | | | | | | | | | | | | | | | | | | Rather than the rather dull colours, use bright versions which normally look better and are easier to read. Signed-off-by: Simon Glass <sjg@chromium.org>
| | * patman: Use ANSI colours only when outputting to a terminalSimon Glass2013-04-04-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | It is easy to detect whether or not the process is connected to a terminal, or piped to a file. Disable ANSI colours automatically when output is not to a terminal. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | cmd_sf: include header file common.h before div64.hMingkai Hu2013-04-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header file div64.h includes <asm/types.h> which defines the phys_addr_t according to the macro CONFIG_PHYS_64BIT, while the macro CONFIG_PHYS_64BIT is included in common.h which comes after div64.h, so in order to get consistent type definition for phys_addr_t, common.h should be included before div64.h, Or else, the parameters of phys_addr_t type will be passed wrongly when CONFIG_PHYS_64BIT is defined. Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>
| * | common/cmd_test: Avoid macro expansionYork Sun2013-04-08-0/+9
| | | | | | | | | | | | | | | | | | | | | cmd_test.c adds "true" and "false" as new commands. We need to avoid macro expansion for U_BOOT_CMD. Signed-off-by: York Sun <yorksun@freescale.com>
| * | dfu: Increase DFU buffer size from 4MiB to 8MiBŁukasz Majewski2013-04-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Increase size of DMA buffer from 4MiB to 8MiB. This is necessary due to uImage size increase. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| * | dfu:ext4:fix: Change ext4write command order of parametersŁukasz Majewski2013-04-08-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commit: "cmd_ext4: BREAK and correct ext4write parameter order" SHA1:0171d52c410cbaa9290b1b214e695697c835bfe5 introduced cleanup of ext4write semantics to be consistent with other filesystem's writing commands (e.g. fatwrite). This commit provides correct ext4write command generation at DFU eMMC code. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| * | Revert "env: fix potential stack overflow in environment functions"Tom Rini2013-04-05-74/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wolfgang requested this be reverted and Rob agreed after further discussion. This was a symptom of a larger problem we need to deal with. This reverts commit 60d7d5a63189c9f77a190c9965861dc15482c2d0. Signed-off-by: Tom Rini <trini@ti.com>
| * | Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flashTom Rini2013-04-04-43/+99
| |\ \ | | |/ | |/|