summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* MAKEALL: display SPL size if presentScott Wood2012-03-26-2/+6
| | | | | | | | This makes it easier to detect changes in the SPL portion, as can currently be done for the main U-Boot image. Signed-off-by: Scott Wood <scottwood@freescale.com> Acked-by: Tom Rini <trini@ti.com>
* ARMV7/Vexpress: add missing get_ticks() and get_tbclk()Liming Wang2012-03-26-0/+10
| | | | | | | | | commit f31a911fe (arm, post: add missing post_time_ms for arm) enables get_ticks and get_tbclk for all arm based boards, arm/vexpress also needs these functions to work. Signed-off-by: Liming Wang <walimisdev@gmail.com> Acked-by: Matt.Waddel@linaro.org
* mkenvimage: fix usage messageWolfgang Denk2012-03-26-1/+1
| | | | | | | | | Don't use argv[0] for usage() because it may or may not be clobbered by the previous call to basename(). Use "prg" instead as it is done in the rest of the code. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
* cmd_fat: add FAT write commandDonggeun Kim2012-03-26-2/+63
| | | | | | | | | | | | | | Once CONFIG_FAT_WRITE is defined, users can invoke 'fatwrite' command that saves data in RAM as a FAT file. This patch was originally part of http://article.gmane.org/gmane.comp.boot-loaders.u-boot/121847 Signed-off-by: Donggeun Kim <dg77.kim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Maximilian Schwerin <mvs@tigris.de> Signed-off-by: Anatolij Gustschin <agust@denx.de>
* fs/fat/fat_write.c: Fix GCC 4.6 warningsAnatolij Gustschin2012-03-26-9/+1
| | | | | | | | | | | | | | | | | Fix: fat_write.c: In function 'find_directory_entry': fat_write.c:826:8: warning: variable 'prevcksum' set but not used [-Wunused-but-set-variable] fat_write.c: In function 'do_fat_write': fat_write.c:933:6: warning: variable 'root_cluster' set but not used [-Wunused-but-set-variable] fat_write.c:925:12: warning: variable 'slotptr' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Donggeun Kim <dg77.kim@samsung.com> Acked-by: Maximilian Schwerin <mvs@tigris.de> Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
* FAT write: Fix compile errorsDonggeun Kim2012-03-24-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes compile errors introduced by commit 9813b750f32c0056f0a35813b9a9ec0f68b664af 'fs/fat: Fix FAT detection to support non-DOS partition tables' fat_write.c: In function 'disk_write': fat_write.c:54: error: 'part_offset' undeclared (first use in this function) fat_write.c:54: error: (Each undeclared identifier is reported only once fat_write.c:54: error: for each function it appears in.) fat_write.c: In function 'do_fat_write': fat_write.c:950: error: 'part_size' undeclared (first use in this function) These errors only appear when this code is enabled by defining CONFIG_FAT_WRITE option. This patch was originally part of http://article.gmane.org/gmane.comp.boot-loaders.u-boot/121847 Signed-off-by: Donggeun Kim <dg77.kim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Maximilian Schwerin <mvs@tigris.de> Fixed patch author and added all needed SoB from the original patch and also submitter's SoB. Extended commit log. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2012-03-23-2/+2
|\ | | | | | | | | * 'master' of git://git.denx.de/u-boot-cfi-flash: cfi: fix the incomplete erased status check in buffer write
| * cfi: fix the incomplete erased status check in buffer writeTao Hou2012-03-21-2/+2
| | | | | | | | | | | | | | | | | | | | Without the fix, flash_write_cfibuffer will terminate the erased status check once an all-0xFF word has been found instead of continuing the erased status check utill the first non-0xFF word. Signed-off-by: Tao Hou <hotforest@gmail.com> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-nds32Wolfgang Denk2012-03-23-4/+22
|\ \ | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-nds32: nds32/n1213: correct vector table in start.S nds32: fix ptrace and interrupt register overflow
| * | nds32/n1213: correct vector table in start.SMacpaul Lin2012-03-19-3/+19
| | | | | | | | | | | | | | | | | | Correct definition of vector table in start.S Signed-off-by: Macpaul Lin <macpaul@gmail.com>
| * | nds32: fix ptrace and interrupt register overflowMacpaul Lin2012-03-19-1/+3
| |/ | | | | | | | | | | | | | | Fix ptrace and interrupt register overflow warning. Add missing P0 and P1 (r26 and r27) into register lists. These register are usually used in OS. Signed-off-by: Macpaul Lin <macpaul@gmail.com>
* | Revert "Add board_pre_console_putc to deal with early console output"Simon Glass2012-03-23-33/+1
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 295d3942b806552503243f5cfb36aec6f1b5a9bf. It turns that this really doesn't work very nicely. Instead we should have a pre-console panic function so that we know that further execution is impossible and we don't need to worry about trampling on UARTs, etc. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | ETX094: adjust linker script due to grown code sizeWolfgang Denk2012-03-19-1/+0
|/ | | | | | | Recent bootstage commits made the code grow, which caused linker errors. Adjust the linker script to fix that. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Armada100: gplugD: Add FAT & EXT2 command supportAjay Bhargav2012-03-19-0/+2
| | | | | | This patch adds FAT and ext2 command support for marvell gplugD Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
* Armada100: gplugD: Add USB command supportAjay Bhargav2012-03-19-0/+12
| | | | | | | This patch adds support for USB commands and USB storage device for Marvell gplugD Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
* USB: Armada100: EHCI Driver for Armada100 SOCsAjay Bhargav2012-03-19-0/+66
| | | | | | This patch adds support for USB EHCI driver for Armada100 SOCs. Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
* USB: Armada100: Add UTMI PHY interface driverAjay Bhargav2012-03-19-0/+183
| | | | | | | This patch adds USB host controller's UTMI PHY interface driver for Armada100 SOCs. Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
* git-mailrc: change usb maintainer to MarekMike Frysinger2012-03-19-1/+1
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* usb:udc:samsung:fix Remove the req_config flagŁukasz Majewski2012-03-19-14/+6
| | | | | | | | | | The dev->req_config flag was indicating that the forwarded request needs to perform the usb gadget delayed status. This is however not needed anymore, so it can be removed. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Cc: Marek Vasut <marex@denx.de>
* USB:gadget:designware Fix memory nonalignment issueShiraz Hashim2012-03-19-1/+11
| | | | | | | | | While receiving packets from FIFO sometimes the buffer provided was nonaligned. Fix this by taking a temporary aligned buffer and then copying the content to nonaligned buffer. Signed-off-by: Shiraz Hashim <shiraz.hashim@st.com> Signed-off-by: Amit Virdi <amit.virdi@st.com>
* USB:gadget:designware Make locally used functions staticAmit Virdi2012-03-19-3/+3
| | | | Signed-off-by: Amit Virdi <amit.virdi@st.com>
* USB:gadget:designware Support high speedVipin KUMAR2012-03-19-0/+11
| | | | | | | This patch adds the support for usb device high speed for designware peripheral. Signed-off-by: Vipin Kumar <vipin.kumar@st.com> Signed-off-by: Amit Virdi <amit.virdi@st.com>
* USB:gadget:designware Device controller bugfixesVipin KUMAR2012-03-19-21/+38
| | | | | | | | | | | | | | | | This patch fixes a few bugs in USB device controller driver. The fixes are as follows 1. Adding error condition checks eg. NULL return 2. Endpoint other than endpoint 0 (control endpoint) are initialized only if usb state machine reaches STATE_ADDRESSED or above 3. Zero length packet handling corrected 4. Dead code removed 5. Bulk out endpoint returns after servicing 1 interrupt and returns back to service if more interrupts are pending Signed-off-by: Vipin Kumar <vipin.kumar@st.com> Signed-off-by: Amit Virdi <amit.virdi@st.com> Acked-by: Marek Vasut <marex@denx.de>
* USB:gadget:designware USB device controller (UDC) implementationVipin KUMAR2012-03-19-36/+37
| | | | | | | | | | The earlier usb device controller driver was specific to spear platforms. This patch implements the usb device controller driver as a generic controller which can be reused by other platforms using this peripheral. Signed-off-by: Vipin Kumar <vipin.kumar@st.com> Signed-off-by: Amit Virdi <amit.virdi@st.com> Acked-by: Marek Vasut <marex@denx.de>
* usb: replace wait_ms() with mdelay()Mike Frysinger2012-03-19-110/+93
| | | | | | | | | | | | | | | | | | | | | | | Common code has a mdelay() func, so use that instead of the usb-specific wait_ms() func. This also fixes the build errors: ohci-hcd.c: In function 'submit_common_msg': /usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available ohci-hcd.c:1519:9: sorry, unimplemented: called from here /usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available ohci-hcd.c:1816:10: sorry, unimplemented: called from here /usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available ohci-hcd.c:1827:10: sorry, unimplemented: called from here /usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available ohci-hcd.c:1844:10: sorry, unimplemented: called from here /usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available ohci-hcd.c:1563:11: sorry, unimplemented: called from here /usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available ohci-hcd.c:1583:9: sorry, unimplemented: called from here make[1]: *** [ohci-hcd.o] Error 1 Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Marek Vasut <marex@denx.de>
* usb: musb: fix printf warningMike Frysinger2012-03-19-1/+1
| | | | | | | | musb_hcd.c: In function 'musb_submit_rh_msg': musb_hcd.c:827:2: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* bootstage: arm: Add bootstage calls in board and bootmSimon Glass2012-03-18-0/+7
| | | | | | | | | | | Add calls to bootstage before and after relocation, and just before jumping to the OS. The idea here is you can call bootstage_report() to get a report. Additionally, if you define CONFIG_BOOTSTAGE_REPORT then a report is printed automatically by U-Boot just before jumping to the kernel. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Plumb in bootstage calls for basic operationsSimon Glass2012-03-18-1/+14
| | | | | | | | This inserts bootstage calls into tftp, usb start and bootm. We could go further, but this is a reasonable start to illustrate the concept. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Implement core microsecond boot time measurementSimon Glass2012-03-18-0/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This defines the basics of a new boot time measurement feature. This allows logging of very accurate time measurements as the boot proceeds, by using an available microsecond counter. To enable the feature, define CONFIG_BOOTSTAGE in your board config file. Also available is CONFIG_BOOTSTAGE_REPORT which will cause a report to be printed just before handing off to the OS. Most IDs are not named at this stage. For that I would first like to renumber them all. Timer summary in microseconds: Mark Elapsed Stage 0 0 reset 205,000 205,000 board_init_f 6,053,000 5,848,000 bootm_start 6,053,000 0 id=1 6,058,000 5,000 id=101 6,058,000 0 id=100 6,061,000 3,000 id=103 6,064,000 3,000 id=104 6,093,000 29,000 id=107 6,093,000 0 id=106 6,093,000 0 id=105 6,093,000 0 id=108 7,089,000 996,000 id=7 7,089,000 0 id=15 7,089,000 0 id=8 7,097,000 8,000 start_kernel Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Replace show_boot_progress/error() with bootstage_...()Simon Glass2012-03-18-146/+166
| | | | | | | These calls should not be made directly any more, since bootstage will call the show_boot_...() functions as needed. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Define an optional microsecond timerSimon Glass2012-03-18-0/+24
| | | | | | | | | | | | Define timer_get_boot_us() which returns the number of microseconds since boot. If undefined then we use get_timer() * 1000. We can fit this in a 32-bit register which keeps everyone happy on the efficiency side. It will wrap around after about an hour. If we are still looking at it after an hour then we had better not be timing the boot. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Convert FIT progress numbers to enumsSimon Glass2012-03-18-38/+80
| | | | | | | This changes over all the FIT image progress numbers to use enums from bootstage.h. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Convert net progress numbers to enumsSimon Glass2012-03-18-26/+38
| | | | | | | This changes over the network-related progress numbers to use enums from bootstage.h. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Convert NAND progress numbers to enumsSimon Glass2012-03-18-17/+32
| | | | | | | This changes over the NAND progress numbers to use enums from bootstage.h. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Convert IDE progress numbers to enumsSimon Glass2012-03-18-23/+39
| | | | | | This changes over the IDE progress numbers to use enums from bootstage.h. Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Convert progress numbers 20-41 to enumsSimon Glass2012-03-18-6/+34
| | | | Signed-off-by: Simon Glass <sjg@chromium.org>
* bootstage: Convert progress numbers 10-19 to enumsSimon Glass2012-03-18-16/+23
| | | | | Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
* 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