summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-12AM35x: Adding SCM general register definitionsAjay Kumar Gupta
Adding general register structure of system control module (SCM) of AM35x. This would be required to access devconf2 and ip_sw_reset register in musb module. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
2010-08-10disk/part.c: 'usb storage' avoiding overflow when output capacitySergei Trofimovich
Before: Marvell>> usb storage Device 0: Vendor: StoreJet Rev: Prod: Transcend Type: Hard Disk Capacity: 28759.9 MB = 28.0 GB (488397168 x 512) After: Marvell>> usb storage Device 0: Vendor: StoreJet Rev: Prod: Transcend Type: Hard Disk Capacity: 238475.1 MB = 232.8 GB (488397168 x 512) Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
2010-08-10Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk
2010-08-10Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk
2010-08-10Merge branch 'master' of git://git.denx.de/u-boot-imxWolfgang Denk
2010-08-10orion5x: allow overriding default mappings windowsAlbert Aribaud
Turn all ORION5X_DEF{ADR,SZ}_xxx macros into ORION5X_{ADR,SZ}_xxx and allow defining them from board code to override defaults. This is particularly useful for defining board-specific FLASH address and size in board header file rather than having to tweak orion5x code. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
2010-08-10Merge branch 'master' of git://git.denx.de/u-boot-marvellWolfgang Denk
2010-08-10Merge branch 'master' of git://git.denx.de/u-boot-tiWolfgang Denk
2010-08-10Merge branch 'master' of ../masterWolfgang Denk
2010-08-10MX51EVK: fix return value of get_timer_maskedLi Haibo
get_timer_masked() should return current timestamp, not current ticks from hardware register. Tested on one custom board with NAND flash. Without this patch, NAND write always TIMEOUT because get_timer(0) return a big value. This patch applies for u-boot-2010.06 Signed-off-by: Li Haibo <hbli@sinocastel.com>
2010-08-10fix cmd_mmc.c, line 136 missing "Reinhard Meyer
Remove warning for missing " at the end of line 136 Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
2010-08-09Fix compile warnings for const correctnessBen Warren
Commit 6e37b1a3a25004d3df5867de49fff6b3fc9c4f04 modifies several net calls to take a (const char *) parameter instead of (char *), but in some cases the modified functions call other functions taking (char *). The end result is warnings about discarding the const qualifier. This patch fixes these other function signatures. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2010-08-09miiphy: leverage current_mii cache moreMike Frysinger
For code that uses miiphy_{read,write}, every call invokes a full look up of the mii list. There is already a "current_mii" cache that is used by some code, but have the miiphy_{read,write} function use it as well. This does increase the code size slightly, but I think it's worth it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2010-08-09miiphy: unify device list lookupMike Frysinger
Rather than have every func re-implement the list walking code, do it one local function. This shrinks the resulting object code a little while making the source much more manageable. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2010-08-09miiphy: constify device nameMike Frysinger
The driver name does not need to be writable, so constify it. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2010-08-09net: rename "FSL UECx" net interfaces "UECx"Kim Phillips
continuation of commit 2ecc2262d66a286e3aac79005bcb5f461312dea8 "net ppc: fix ethernet device names with spaces" (currently in u-boot-net.git) for QE based parts. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Acked-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2010-08-09net ppc: fix ethernet device names with spacesHeiko Schocher
since commit 1384f3bb8a4f9066805b70c1418eda78ecb73fdd ethernet names with spaces drop a Warning: eth device name has a space! message. This patch fix it for: - "FEC ETHERNET" devices found on mpc512x, mpc5xxx, mpc8xx and mpc8220 boards. renamed to "FEC". - "SCC ETHERNET" devices found on mpc8xx, mpc82xx based boards. Renamed to "SCC". - "HDLC ETHERNET" devices found on mpc8xx boards Renamed to "HDLC" - "FCC ETHERNET" devices found on mpc8260 and mpc85xx based boards. Renamed to "FCC" Tested on the kup4k board. Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2010-08-09net,fec: Shorten device name as done for other driversStefano Babic
After discussion on the ML it is suggested to drop unrequired and not useful characters from the device name. This patch changes the name for the fec_mxc driver from "FEC_MXC" to "FEC". Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
2010-08-09ppc4xx: Fix/Update katmai board headerStefan Roese
This patch has the following fixes/changes: - Set 'kernel_addr' and 'ramdisk_addr' to correct values and add 'fdt_addr' environment variable - Remove 'kozio' environment variable - Remove environmant variables to boot ancient arch/ppc Linux kernels - Remove CONFIG_SYS_BOOTMAPSZ definition. It's already defined to the same value in amcc-common.h Signed-off-by: Stefan Roese <sr@denx.de>
2010-08-09ppc4xx: Fix building of sc3 boardHeiko Schocher
Update image size after addition of new environment handling. Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
2010-08-09ppc4xx: Fix building of PMC440 boardMatthias Fuchs
Update image size and default environment after addition of new environment handling. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
2010-08-09ppc4xx: Fix building of CANBT boardMatthias Fuchs
Update image size after addition of new environment handling. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
2010-08-09ppc4xx: Fix building of AR405 boardMatthias Fuchs
Update image size after addition of new environment handling. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
2010-08-09ppc4xx: cleanup default environment for AMCC boardsWolfgang Denk
None of the AMCC boards uses an embedded environment, so there is no need to run "saveenv" after updating U-Boot. Drop the redundant commands from the default environment. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
2010-08-09PXA: Declare __io for vpac270 IDEMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-09PXA: Fix missing includesMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-09PXA: Fix off-the-tree build problemsMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
2010-08-09config.mk: avoid -traditional-cpp on OS X 10.5Mike Frysinger
Simply trying to include a basic header file like stdlib.h on OS X 10.5 and then building with -traditional-cpp fails with lots of errors like: In file included from /usr/include/stdlib.h:63, from test.c:3: /usr/include/available.h:85: error: stray '#' in program /usr/include/available.h:85: error: syntax error before numeric constant /usr/include/available.h:86: error: stray '#' in program In the past, I hadn't noticed because the old logic for these flags were restricted to Darwin running on PowerPC systems while I'm running on an Intel system. But after some recent clean ups and changes, the flag was being applied to all Darwin systems and my host tools broke. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-08-09fdt: Fix bug in size calculation in fdt_resize() with initrd useFeng Wang
Original bug description from Feng (fdt_resize() bug caused "WARNING: could not set linux, initrd-start FDT_ERR_NOSPACE."): What I got is an error: "WARNING: could not set linux,initrd-start FDT_ERR_NOSPACE." after loading Device Tree blob. This in turn caused linux to miss init part. After some digging, I found out the reason for this error, it is caused by fdt_resize(). FDT blob got resized after filling in all board specific information of PowerPC. (in boot_body_linux()). It reduced blob size with only extra space for two fdt_reserve_entry, one for fdt itself, and one for initrd. Then it's aligned to a 0x1000 page boundary. However, later in fdt_initrd(), it could add two more properties, initrd-start AND initrd-end, each one needs at least two fdt_reserve_entry sizes done by _fdt_add_property() (name and value). Thus, the two fdt_reserve_entry extra space is not sufficient. So for some specific fdt size which is just under the page boundary after resizing, this will cause an error of FDT_ERR_NOSPACE in fdt_initrd() when setting those two properties, and failed to pass initrd information to linux. My fix is in fdt_resize(), leave at least 4 fdt_reserve_entry for initrd. So instead of 2*sizeof(struct fdt_reserve_entry) for actual_totalsize, use 5*sizeof(struc fdt_reserve_entry). Stefan: I got this same error on katmai, when trying to boot with initrd (run flash_self). This patch fixes this issue. Signed-off-by: Feng Wang <fwang02@harris.com> Tested-by: Stefan Roese <sr@denx.de> Cc: Jerry Van Baren <gvb.uboot@gmail.com> Acked-by: Gerald Van Baren <vanbaren@cideas.com>
2010-08-09board/purple/flash.c: removed unneded variableFrans Meulenbroeks
removed a variable that was not used Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
2010-08-09various cmd_* files: fixed layout a little bitFrans Meulenbroeks
Most of the files have U_BOOT_CMD on a separate line, but a few didn't and had the first line on the same line as U_BOOT_CMD. This changes these files by adding a line break and a tab Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
2010-08-09various cmd_* files: remove the command name from the help messageFrans Meulenbroeks
removed the command name from the help message as it is already printed. for cmd_mmc also rewrote the message a little bit Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
2010-08-09tools/env/fw_printenv: Make redundant env work on locked flashes alsoDetlev Zundel
The invalidation of the old environment instance did not work for flashes supporting hardware locking. Now we unlock/lock around this update also. Signed-off-by: Detlev Zundel <dzu@denx.de>
2010-08-09flash_protect: check for NULL flash infoMike Frysinger
If a flash is unable to be detected, and then someone calls flash_protect on it (like the common code does in flash_init), the flash_protect logic will dereference a NULL pointer. Since flash_protect already does sanity checking on the info structs, add a NULL pointer check in there. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-08-09getenv_f(): fix handling of too short buffersWolfgang Denk
Fix error handling in getenv_f() when the user provided buffer is too short to hold the variable name; make sure to truncate and NUL-terminate without overwriting the buffer limits. Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-08-09dataflash mmc mux: use common cmd_usage functionMike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-08-09mflash: use common cmd_usage functionMike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-08-09print_buffer: optimize & shrinkMike Frysinger
Applying a little creative format string allows us to shrink the initial data read & display loop by only calling printf once. Re-using the local data buffer to generate the string we want to display then allows us to output everything with just one printf call instead of multiple calls to the putc function. The local stack buffer needs increasing by 1 byte, but the resulting code shrink and speed up is worth it I think. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-08-09cmd editing: optimize/shrink output blankingMike Frysinger
No need to output spaces 1 char at a time in a loop when the printf code can do the same thing with the right format string. This shrinks things and gives a nice speed up when killing off lines more than a byte or two as printf will send out the buffer in one big chunk. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2010-08-098xx, kup4k/kup4x: add FDT supportHeiko Schocher
Signed-off-by: Heiko Schocher <hs@denx.de>
2010-08-098xx, kup4k/kup4x: configuration changes, code cleanupHeiko Schocher
- nfs-options removed - hda->sda changed - mtd parts added - loadaddress changed - cmd-line length increased - lcd stuff removed - code cleanup (use I/O accessors etc.) Signed-off-by: Klaus Heydeck <heydeck@kieback-peter.de>
2010-08-08fdt relocate: have more attention to use a bootmap or notStephan Linz
Platforms with flat device tree support can use a bootmap to relocate the fdt_blob. This is not a must. That's why the relocation function boot_relocate_fdt() should be use only if CONFIG_OF_LIBFDT was defined together with CONFIG_SYS_BOOTMAPSZ (see common/cmd_bootm.c). On MicroBlaze platforms there is no need to use a bootmap to relocate a fdt blob. So we need a more precise focus on the compilation and usage of boot_relocate_fdt(). In general it is valid to exclude the function boot_relocate_fdt() if the bootmap size CONFIG_SYS_BOOTMAPSZ is not defined. Signed-off-by: Stephan Linz <linz@li-pro.net>
2010-08-08Add mkimage manpageNobuhiro Iwamatsu
Some Linux distributions include the "mkimage" as a package. This commit provides a manual page for mkimage. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Added documentation for FIT images and examples. Moved to doc/ directory. Signed-off-by: Wolfgang Denk <wd@denx.de>
2010-08-08Kirkwood: openrd_base: Added SATA supportPrafulla Wadaskar
This patch enables mvsata driver and related filesystem support. The patch is tested for ide reset and ext2ls operation for a disk drive connected on SATA port0. This patch depends upon the patche-series http://lists.denx.de/pipermail/u-boot/2010-August/074908.html Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
2010-08-08cmd_ide: add support for KirkwoodPrafulla Wadaskar
Added MVSATAC definitions to Kirkwood. Added support for Kirkwood in cmd_ide. Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
2010-08-08edminiv2: add mvsata_ide and cmd_ide supportAlbert Aribaud
Add mvsata_ide and cmd_ide configuration in edminiv2 config Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
2010-08-08cmd_ide: add support for orion5xAlbert Aribaud
Add MVSATAHC definitions to orion5x. Add support for orion5x in cmd_ide. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
2010-08-08ide: add mvsata_ide driverAlbert Aribaud
This driver only provides initialization code; actual driving is done by cmd_ide.c using the ATA compatibility mode of the Marvell SATAHC controller. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
2010-08-08ide: reorder object files alphabeticallyAlbert Aribaud
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
2010-08-08ide: add configurationAlbert Aribaud
CONFIG_IDE_SWAP_IO This configuration option replaces a complex conditional in cmd_ide.c with an explicit define to be added to SoC or board configs. Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>