summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* image: Support FDTs already loaded at their load addressStephen Warren2012-03-06-3/+10
| | | | | | | | | | | | | boot_get_fdt() expects a uImage-wrapped FDT to be loaded to a staging location, and then memmove()s it to the load address specified in the header. This change enhances boot_get_fdt() to detect when the image has already been loaded to the correct address, and skip this memmove(). The detection algorithm was written to match the equivalent for the kernel; see bootm_load_os()'s IH_COMP_NONE case. v2: New patch Signed-off-by: Stephen Warren <swarren@nvidia.com>
* cmd_cache: use cache/invalidate functions available in common.hStefan Kristiansson2012-03-06-8/+8
| | | | | | | | | | flush_dcache()/flush_icache() aren't defined in common.h, flush_dcache_all()/invalidate_icache_all() however are. Let the icache and dcache commands use those instead. Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Acked-by: Mike Frysinger <vapier@gentoo.org>
* tools: checkstack.pl from Linux added to toolsTom Rini2012-03-06-0/+176
| | | | | | Added from Linux - commit 62aa2b537c6f5957afd98e29f96897419ed5ebab Signed-off-by: Tom Rini <trini@ti.com>
* Makefile: Remove mmc_spl related enteriesChander Kashyap2012-03-06-9/+1
| | | | | | | As mmc_spl now follows SPL infrastructure, removed unwanted entries in Makefile for mmc_spl related compilation. Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
* Merge branch 'master' of git://git.denx.de/u-boot-x86Wolfgang Denk2012-03-06-3/+2
|\ | | | | | | | | * 'master' of git://git.denx.de/u-boot-x86: sc520: fix build warning about unused temp var
| * sc520: fix build warning about unused temp varMike Frysinger2012-03-06-3/+2
| | | | | | | | | | | | | | | | | | | | | | Building the eNET_SRAM board fails for me: sc520_timer.c: In function 'sc520_udelay': sc520_timer.c:81:7: error: variable 'temp' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors make[1]: *** [sc520_timer.o] Error 1 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | PPC: Drop mv6446x_eth_initialize() from net/eth.cMarek Vasut2012-03-06-6/+13
| | | | | | | | | | | | | | | | This function was defined as an extern in net/eth.c, drop that and use standard means of calling it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefan Roese <sr@denx.de>
* | PPC: Drop mv6436x_eth_initialize() from net/eth.cMarek Vasut2012-03-06-5/+12
| | | | | | | | | | | | | | | | This function was defined as an extern in net/eth.c, drop that and use standard means of calling it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
* | Convert cmd_usage() calls in common to use a return valueSimon Glass2012-03-06-168/+167
| | | | | | | | | | | | | | | | | | Change all files in common/ to use CMD_RET_USAGE instead of calling cmd_usage() directly. I'm not completely sure about this patch since the code since impact is small (100 byte or so on ARM) and it might need splitting into smaller patches. But for now here it is. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Add cmd_process() to process commands in one placeSimon Glass2012-03-06-78/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | We currently have the same code in hush.c and main.c. This brings the code into one place. As an added feature, if the command function returns CMD_RET_USAGE then cmd_process() will print a usage message for the command before returning the standard failure code of 1. ARM code size increases about 32 bytes with this clean-up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Remove interleave of non-U-Boot code in hushSimon Glass2012-03-06-13/+11
| | | | | | | | | | | | | | There is a nasty interleave of #ifdefs in hush.c where the two code paths have different indents. Remove this ickiness. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Create a single cmd_call() function to handle command executionSimon Glass2012-03-06-8/+28
| | | | | | | | | | | | | | We should aim for a single point of entry to the commands, whichever parser is used. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Don't include standard parser if hush is usedSimon Glass2012-03-06-0/+2
| | | | | | | | | | | | | | This saves about 1KB of code space on ARM with CONFIG_SYS_HUSH_PARSER defined. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Stop using builtin_run_command()Simon Glass2012-03-06-43/+34
| | | | | | | | | | | | | | | | | | | | Boards can select either the 'built-in' parser or the hush parser. We should not call builtin_run_command() if we are using the hush parser. We use run_command() instead, since it knows how to call the correct parser. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Rename run_command2() to run_command()Simon Glass2012-03-06-7/+7
| | | | | | | | | | | | | | This is a more sensible name, so rename it. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Rename run_command() to builtin_run_command()Simon Glass2012-03-06-13/+14
| | | | | | | | | | | | | | | | | | The current run_command() is only one of the parsing options - the other is hush. We should not call run_command() when the hush parser is being used. So we rename this function to better explain its purpose. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Remove CMD_PXE's static on run_command()Simon Glass2012-03-06-5/+0
| | | | | | | | | | | | | | | | It really isn't clear why this is here and there is no comment, so drop it. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Remove execute permissions from source filesThomas Weber2012-03-04-0/+0
|/ | | | Signed-off-by: Thomas Weber <weber@corscience.de>
* integrator: remove fragile delay loop from PCI codeLinus Walleij2012-03-04-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The reference implementation of the PCI initialization code almost everywhere contain this fragile loop of "a few usecs", and its use of volatile variables to delay a number of bus cycles is indeed uncertain. Reading the manual "Integrator/AP Users Guide", page 5-15 it is clearly stated: "Wait until 230ms after the end of the reset period before accessing V360EPC internal registers. The V360EPC supports the use of a serial configuration PROM and the software must wait for the device to detect the absence of this PROM before accessing any registers. The required delay is a function of the PCI Clock, but at the lower frequency (25MHz) is 230ms". So let's simply wait 230ms per the spec. This solves the compilation error that looked like this: pci.c: In function ‘pci_init_board’: pci.c:286:18: warning: variable ‘j’ set but not used Reported-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* pci: move pciauto_config_init() to pci.hLinus Walleij2012-03-04-4/+1
| | | | | | | | | | | | | Fixing build regressions for the Integrator I get find that a few boards try to work around the missing declaration of pciauto_config_init() by declaring it in the local scope. This does not make sense when the sibling functions are in <pci.h> so move the function to the header, ridding the build error in the Integrator and getting rid of the local declarations here and there. Reported-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* ppc: Change memsz variable to signed charSimon Glass2012-03-03-4/+3
| | | | | | | | This seems to be unsigned char for no good reason. Tidy this up and remove the casts. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* m68k: Change memsz to a signed char to avoid warningSimon Glass2012-03-03-1/+1
| | | | | | | | | | There doesn't seem to be any reason for using uchar here, so change it to char. This fixes a warning: pointer targets in passing argument 1 of 'sprintf' differ in signedness Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* USB: relax usbcore reset timingsWolfgang Grandegger2012-03-03-1/+4
| | | | | | | | | | | | Following the corresponding Linux code, this patch relaxes reset timings waiting at least 100ms after power to the ports. There are some reports that it helps make enumeration work better on some high speed devices. Furthermore, the wait is only done once after power has been enabled on all ports. CC: Remy Bohmer <linux@bohmer.net> CC: Vincent Palatin <vpalatin@chromium.org> Signed-off-by: Wolfgang Grandegger <wg@denx.de>
* USB: move keyboard polling into kbd driveramartin@nvidia.com2012-03-03-72/+17
| | | | | | | | | This moves keyboard polling logic from USB HCD drivers into USB keyboard driver. Remove usb_event_poll() as keyboard polling was the only user of this API. With this patch USB keyboard works with EHCI controllers again. Tested on a tegra2 seaboard. Signed-off-by: Allen Martin <amartin@nvidia.com>
* USB: reevaluate iomux stdin on USB kbd detectamartin@nvidia.com2012-03-03-0/+6
| | | | | | | If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard device is detected. Signed-off-by: Allen Martin <amartin@nvidia.com>
* usb: add numeric keypad support to HID driverVincent Palatin2012-03-03-0/+10
| | | | | | | When keys are pressed on the numeric keypad, emit key codes for the numbers, operators, dot and enter. Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
* USB: fix USB keyboard polling parameterVincent Palatin2012-03-03-1/+1
| | | | | | | | When doing a "GET_REPORT" request on the keyboard control endpoint, the report ID should 0 (ie report ID not used) rather than 1 as reports are not used in boot mode. Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
* eth: remove usb-ethernet devices before re-enumerating themVincent Palatin2012-03-03-2/+35
| | | | | | | | Fix the crash when running several times usb_init() with a USB ethernet device plugged. Signed-off-by: Vincent Palatin <vpalatin@chromium.org> Tested-by: Wolfgang Grandegger <wg@denx.de>
* USB: Make struct devrequest setup_packet localMarek Vasut2012-03-03-1/+2
| | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Remy Bohmer <linux@bohmer.net> Acked-by: Mike Frysinger <vapier@gentoo.org>
* USB: Separate out USB hub driverMarek Vasut2012-03-03-431/+487
| | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Remy Bohmer <linux@bohmer.net> Acked-by: Mike Frysinger <vapier@gentoo.org>
* USB: Staticize internal functionsMarek Vasut2012-03-03-22/+23
| | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Remy Bohmer <linux@bohmer.net> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2012-03-03-73/+54
|\ | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-nand-flash: cmd_nand.c: Fix 'nand dump' after latest MTD resync mtd/nand:Fix wrong usage of is_blank() in fsl_ifc_run_command mtd/nand: Fix IFC driver to support 2K NAND page nand: reinstate lazy bad block scanning Revert "nand: make 1-bit software ECC configurable"
| * cmd_nand.c: Fix 'nand dump' after latest MTD resyncTom Rini2012-02-28-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With 2a8e0fc nand_do_read_ops changed in behavior slightly (keeping in sync with the kernel which did this change in b64d39d8) such that the OOB data is always copied into oobbuf and never appended to datbuf. Within U-Boot only the nand_dump function (for the dump nand subcommand) was expecting the OOB data to only be appended to datbuf. So we now change nand_dump to not malloc extra space, correct the comment about datbuf and OOB data and switch the pointer to oobbuf before printing. Cc: Scott Wood <scottwood@freescale.com> Signed-off-by: Tom Rini <trini@ti.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * mtd/nand:Fix wrong usage of is_blank() in fsl_ifc_run_commandPrabhakar Kushwaha2012-02-28-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Freescale IFC NAND Machine calculates ECC on 512byte sector and same is used in fsl_ifc_run_command() during ECC status verification. Also this sector is passed to is_blank() for blank checking. It is wrong at first place because is_blank()'s implementation checks for Page size and OOB area size. is_blank() should be called per page for main and OOB area verification. Variables name are redefined to avoid confusion between buffer and ecc sector. Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * mtd/nand: Fix IFC driver to support 2K NAND pagePrabhakar Kushwaha2012-02-28-14/+13
| | | | | | | | | | | | | | | | | | | | | | 1) OOB area should be updated irrespective of NAND page size. Earlier it was updated only for 512byte NAND page. 2) During OOB update fbcr should be equal to OOB size. Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * nand: reinstate lazy bad block scanningScott Wood2012-02-28-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 2a8e0fc8b3dc31a3c571e439fbf04b882c8986be ("nand: Merge changes from Linux nand driver") accidentally reverted commit 13f0fd94e3cae6f8a0d9fba5d367e311edc8ebde ("NAND: Scan bad blocks lazily."). Reinstate the change, as amended by commit ff49ea8977b56916edd5b1766d9939010e30b181 ("NAND: Mark the BBT as scanned prior to calling scan_bbt."). Signed-off-by: Scott Wood <scottwood@freescale.com>
| * Revert "nand: make 1-bit software ECC configurable"Scott Wood2012-02-28-30/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4fee6c2f295f932b8febdc7ce8731ba045695fa5. It breaks boards that currently rely on soft-ecc, as pointed out here: http://patchwork.ozlabs.org/patch/140872/ The reverted patch should be resubmitted with documentation, and with the CONFIG_MTD_ECC_SOFT selected from every board that needs it. We could start by looking at what NAND driver the board selects, and whether that driver ever asks for soft ECC. Signed-off-by: Scott Wood <scottwood@freescale.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-nds32Wolfgang Denk2012-03-03-2/+32
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-nds32: nds32/board.c: add PCI prompt at boot up nds32/ag101/watchdog.S: add linkage support nds32: add linkage support
| * | nds32/board.c: add PCI prompt at boot upMacpaul Lin2012-02-28-0/+1
| | | | | | | | | | | | | | | | | | add PCI prompt at boot up for probing PCI device Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * | nds32/ag101/watchdog.S: add linkage supportMacpaul Lin2012-02-28-2/+3
| | | | | | | | | | | | | | | | | | Add linkage support to watchdog.S. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * | nds32: add linkage supportMacpaul Lin2012-02-28-0/+28
| |/ | | | | | | | | | | Add linkage support. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* | Ethernut 5: fix build errorprabhakar.csengg@gmail.com2012-02-29-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build error for ethernut5 board due to prototype change for function board_mmc_getcd(). ethernut5.c:238: error: conflicting types for 'board_mmc_getcd' u-boot/include/mmc.h:318: note: previous declaration of 'board_mmc_getcd' was here make[2]: *** [ethernut5.o] Error 1 Signed-off-by: Prabhakar Lad <prabhakar.csengg@gmail.com> Cc: Tim Schendekehl <tim.schendekehl@egnite.de> Cc: Thierry Reding <thierry.reding@avionic-design.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: egnite GmbH <info@egnite.de>
* | armv7: omap3: leave outer cache enabledAneesh V2012-02-27-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainline kernel for OMAP3 doesn't enable L2 cache It expects L2$ to be enabled by ROM-code/bootloader. Leaving L2$ enabled can be troublesome in cases where the L2 cache is not under CP15 control, such as in Cortex-A9. This problem is explained in detail in the commit dc7100f4080952798413fb63bb4134b22c57623a However, this problem doesn't apply to Cortex-A8 because L2$ in Cortex-A8 is under CP15 control and hence the generic armv7 maintenance opertions work for it. As such we can make an exception for OMAP3 and leave the L2$ enabled when we jump to kernel. This is done by removing the strongly-linked implementation of v7_outer_cache_disable() and allowing it to fall back to the weakly linked implementation that doesn't do anything. Signed-off-by: Aneesh V <aneesh@ti.com>
* | at91: modified NAND flash timing on otc570 boardDaniel Gorsulowski2012-02-27-4/+4
| | | | | | | | Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
* | at91: modified NAND flash timing on meesc boardDaniel Gorsulowski2012-02-27-4/+4
| | | | | | | | Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
* | tt01: fix hush parser config, add release configHelmut Raiger2012-02-27-3/+8
| | | | | | | | | | | | | | Add PREBOOT, SILENT_CONSOLE and DEVICE_NULLDEV for release build. Fixed bug in CONFIG_SYS_HUSH_PARSER define. Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
* | tt01: add video supportHelmut Raiger2012-02-27-1/+50
| | | | | | | | | | | | | | | | The video setup for the Epson display is provided. Addtionally some extra info is displayed next to the Linux logo. Make get_cpu_rev() publicly available (added to sys_proto.h). Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
* | tt01: fix environment sizeHelmut Raiger2012-02-27-1/+1
| | | | | | | | | | | | size of environment must match erasable block size in the flash. Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
* | i.mx6q: mx6qsabrelite: Update the network configurationTroy Kisky2012-02-27-33/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define CONFIG_PHY_MICREL, and minimize the tx clock delay. There is an issue with 1000 baseTx mode on early revs of the SabreLite boards. The center tap pin 9 of the mag RJ45 USB combo was connected to the 3.3 filtered supply. Letting this pin float solved the problem. Symptoms of the problem were packets with many extra zeroes tacked on the end, and random bit flips causing a high rate of CRC errors. 10/100 baseTx worked fine on all revs. To disable 1000 baseTx for these boards, simply define the environment variable disable_giga. ie. setenv disable_giga 1 Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
* | net: phy: make board_phy_config responsible for calling drv->configTroy Kisky2012-02-27-3/+6
| | | | | | | | | | | | | | | | | | Boards may have things they want done before or after normal phy config. Letting the boards call drv->config allows them more flexibilty. Boards affected by this change are corenet_ds and mpc8544ds. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Acked-by: Dirk Behme <dirk.behme@de.bosch.com>