summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* bootstage: Convert progress numbers 1-9 into enumsSimon Glass2012-03-18-46/+59
| | | | Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Use show_boot_error() for -ve progress numbersSimon Glass2012-03-18-68/+72
| | | | | | | | Rather than the caller negating our progress numbers to indicate an error has occurred, which seems hacky, add a function to indicate this. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* bootstage: Make use of BOOTSTAGE_ID_RUN_OS in show_boot_progress()Simon Glass2012-03-18-20/+19
| | | | | | | | | This changes the number 15 as used in boot_stage_progress() to use the new name provided for it. This is a separate patch because it touches so many files. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* bootstage: Create an initial header for boot progress integersSimon Glass2012-03-18-4/+60
| | | | | | | | | | | | At present boot_stage_progress() is called with various magic numbers. The new bootstage.h header will be used to turn these into symbolic names throughout the code. The intent is not that these numbers are passed to Linux. In fact by using an enum to track them we should eventually be able to remove the explict numbers and just have the stages count up from 0. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootvx: Clear and disable data cache, and call vxWorks with parameter.Reinhard Arlt2012-03-18-1/+2
| | | | | | | | | | | | | | | | | This patch clear and disable the data cache for vxWorks. The entry point sysInit(int) intended by Windriver to be called from the vxWorks bootrom, a very small vxWorks system. The routine is called by the go() handler in the bootrom, that clears the cache from start of image to end of usable memory. The PowerPC implementations only invalidates and disable the cache, the ARM implementations also flush it. U-Boot will be on the safe side, if it disables the data cache before calling vxWorks sysInit(int). Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
* net/miiphy/serial: drop duplicate "NAMESIZE" defineMike Frysinger2012-03-18-16/+13
| | | | | | | | | | A few subsystems are using the same define "NAMESIZE". This has been working so far because they define it to the same number. However, I want to change the size of eth_device's NAMESIZE, so rather than tweak the define names, simply drop references to it. Almost no one does, and the handful that do can easily be changed to a sizeof(). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* CPCI750: Add CPCI-HD/2 supportReinhard Arlt2012-03-18-9/+33
| | | | | | | | This patch adds support for the esd CPCI-HD/2 board to u-boot for CPCI-CPU/750. As the primary devices on the CPCI-HD/2 board are connected to device 1 and 3, the device must be swapped. Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
* Merge branch 'master' of git://git.denx.de/u-boot-avr32Wolfgang Denk2012-03-17-587/+49
|\ | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-avr32: atmel_mci.h: remove outdated register macros doc/git-mailrc: add <me> to avr32 alias ATMEL: remove old atmel_mci driver ATMEL: use generic mmc framework
| * atmel_mci.h: remove outdated register macrosAndreas Bießmann2012-03-13-36/+0
| | | | | | | | | | | | | | New gen_atmel_mci driver does not use the outated register access macros. Since the old atmel_mci driver is deleted these macros are no longer necessary. Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
| * doc/git-mailrc: add <me> to avr32 aliasAndreas Bießmann2012-03-13-1/+1
| | | | | | | | Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * ATMEL: remove old atmel_mci driverSven Schnelle2012-03-13-537/+3
| | | | | | | | | | | | | | | | All boards are using the gen_atmel_mci driver now, so no need to carry the old driver around. Signed-off-by: Sven Schnelle <svens@stackframe.org> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * ATMEL: use generic mmc frameworkSven Schnelle2012-03-13-14/+46
| | | | | | | | | | | | | | | | | | gen_atmel_mci works on AVR32 as well, so no need to use the legacy mmc driver. This also has the nice side effect of being able to use SDHC cards an those boards. Signed-off-by: Sven Schnelle <svens@stackframe.org> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
* | Merge branch 'sandbox' of git://git.denx.de/u-boot-blackfinWolfgang Denk2012-03-17-20/+828
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'sandbox' of git://git.denx.de/u-boot-blackfin: sandbox: mark os_exit as noreturn sandbox: add getopt support sandbox: allow processing before main loop sandbox: add concept of sandbox state sandbox: disable fortification sandbox: u-boot.lds: tweak style sandbox: add get_{tbclk,ticks} sandbox: enable GPIO driver sandbox: gpio: add basic driver for simulating GPIOs sandbox: add flags for open() call sandbox: config: enable fdt and snprintf() options sandbox: fdt: add support for CONFIG_OF_CONTROL sandbox: add lseek helper sandbox: add ifdef protection to os.h sandbox: add required header to os.c sandbox: sort header files in os.c
| * | sandbox: mark os_exit as noreturnMike Frysinger2012-03-12-1/+1
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: add getopt supportSimon Glass2012-03-12-0/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds simple command-line parsing to sandbox. The idea is that it sets up the state with options provided, and this state can then be queried later, as needed. New flags are declared with the SB_CMDLINE_OPT_SHORT helper macro, pointers are automatically gathered up in a special section, and then the core code takes care of gathering them up and processing at runtime. This way there is no central place where we have to store a list of flags with ifdefs. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: allow processing before main loopSimon Glass2012-03-12-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | In order to pass command line arguments to sandbox we need to be able to act on them. So take control back at the end of board_init_r() from where we can call the main loop or do something else. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: add concept of sandbox stateSimon Glass2012-03-12-2/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The state exists through the life of U-Boot. It can be adjusted by command line options and perhaps later through a config file. It is available to U-Boot through state_...() calls (within sandbox code). The primary purpose of this is to contain the "hardware" state. It should only be used by sandbox internal code. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: disable fortificationMike Frysinger2012-03-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since we provide all our own library calls, the fortification from glibc just gets in our way (which some distros enable by default). Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: u-boot.lds: tweak styleMike Frysinger2012-03-12-5/+5
| | | | | | | | | | | | | | | | | | | | | We use tabs for indentation, not spaces. Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: add get_{tbclk,ticks}Mike Frysinger2012-03-12-0/+10
| | | | | | | | | | | | | | | | | | Fixes building after recent readline updates with timeouts. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: enable GPIO driverSimon Glass2012-03-12-0/+4
| | | | | | | | | | | | | | | | | | | | | Enable the new GPIO driver for sandbox. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: gpio: add basic driver for simulating GPIOsSimon Glass2012-03-12-0/+291
| | | | | | | | | | | | | | | | | | | | | | | | This provides a way of simulating GPIOs by setting values which are seen by the normal gpio_get/set_value() calls. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: add flags for open() callSimon Glass2012-03-12-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | This provides a way for callers to create files for writing. The flags are translated at runtime, for the ones we support. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: config: enable fdt and snprintf() optionsSimon Glass2012-03-12-0/+6
| | | | | | | | | | | | | | | | | | | | | Enable fdt code and safe snprintf() options for sandbox. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: fdt: add support for CONFIG_OF_CONTROLSimon Glass2012-03-12-0/+9
| | | | | | | | | | | | | | | | | | | | | This adds support for a controlling fdt, mirroring the ARM implementation. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: add lseek helperMike Frysinger2012-03-12-0/+28
| | | | | | | | | | | | | | | | | | | | | Follow up patches want to be able to seek fd's. Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: add ifdef protection to os.hMike Frysinger2012-03-12-0/+5
| | | | | | | | | | | | | | | Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: add required header to os.cSimon Glass2012-03-12-0/+1
| | | | | | | | | | | | | | | | | | | | | We should include the sys/time.h header to avoid warnings. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sandbox: sort header files in os.cSimon Glass2012-03-12-4/+4
| | | | | | | | | | | | | | | | | | | | | Tidy this up as the list is long and likely to get longer. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2012-03-17-38/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-sh: sh: timer: Remove unnecessary variable 'ticks' sh: Fix sh7264 clock speed and related serial setting net: sh_eth: Remove unnecessary return net: sh_eth: Collect up EDMR_INIT_CNT to TIMEOUT_CNT net: sh_eth: Remove SH_ETH_PHY_DELAY sh: ecovec: Add support PHY of SMSC sh: sh_eth: Add support SH7724
| * | | sh: timer: Remove unnecessary variable 'ticks'Nobuhiro Iwamatsu2012-03-08-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Reported-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: Fix sh7264 clock speed and related serial settingPhil Edworthy2012-03-08-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generalised calculation of the serial bit rate reg also applies to sh7264, it was just the clock speed that was set incorrectly. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | net: sh_eth: Remove unnecessary returnNobuhiro Iwamatsu2012-03-08-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | net: sh_eth: Collect up EDMR_INIT_CNT to TIMEOUT_CNTNobuhiro Iwamatsu2012-03-08-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EDMR_INIT_CNT holds the check count of initialization. Since there were more same values (1000), this collected as TIMEOUT_CNT. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | net: sh_eth: Remove SH_ETH_PHY_DELAYNobuhiro Iwamatsu2012-03-08-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SH_ETH_PHY_DELAY is not used. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: ecovec: Add support PHY of SMSCNobuhiro Iwamatsu2012-03-08-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | sh: sh_eth: Add support SH7724Nobuhiro Iwamatsu2012-03-08-23/+60
| |/ / | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | | mxsboot: fix tool name in usage messageOtavio Salvador2012-03-17-1/+1
| |/ |/| | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* | Revert "post/Makefile: Only build FP post tests if enabled via ↵Wolfgang Denk2012-03-12-1/+1
|/ | | | | | | | | | | | | | CONFIG_SYS_POST_FPU" This reverts commit 3e16abe0e468c568b30acb7d8583e3dbed6f177b. The logic of this patch is broken - testing for CONFIG_SYS_POST_FPU in the Makefile cannot work, as this is only a bit that may (or may not) be set in the CONFIG_POST variable. The patch cases build errors on a number of boards, so we revert it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* 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>