summaryrefslogtreecommitdiff
path: root/common
Commit message (Collapse)AuthorAgeLines
* FIX: watchdog timeout, while waiting for inputJens Scharsig2010-04-10-0/+3
| | | | | | | | * add WATCHDOG_RESET to !tstc() loops * prevents watchdog timeout, while waiting for input, if CONFIG_BOOT_RETRY_TIME or CONFIG_SHOW_ACTIVITY defined Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
* malloc: sbrk() should return MORECORE_FAILURE instead of NULL on failurekarl.beldan@gmail.com2010-04-10-1/+1
| | | | Signed-off-by: Karl Beldan <karl.beldan@gmail.com>
* cmd_bmp.c: add standard subcommand handlingFrans Meulenbroeks2010-04-09-25/+56
| | | | | Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Acked-by: Detlev Zundel <dzu@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-ubiWolfgang Denk2010-04-09-1/+1
|\
| * cmd_ubi: Fix uninitialized variable warningPeter Tyser2010-04-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | gcc 3.4.6 previously reported the following error on many MIPS boards which utilize UBI: cmd_ubi.c:193: warning: 'vol' might be used uninitialized in this function The current code is structured such that 'vol' will never be used when it is NULL anyway, but gcc isn't smart enough to figure this out. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | USB storage probeKim B. Heino2010-04-08-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | While debugging one ill behaving USB device I found two bugs in USB storage probe. usb_stor_get_info() returns -1 (error), 0 (skip) or 1 (ok). First part of this patch fixes error case. Second part fixes usb_inquiry()'s retry counter handling. Original code had retry = -1 on error case, not retry = 0 as checked in the next line. Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
* | USB storage countKim B. Heino2010-04-08-6/+9
|/ | | | | | | | | | | | | | | | Here's another USB storage patch. Currently U-Boot handles storage devices #0 - #4 as valid devices, even if there is none connected. This patch fixes usb_stor_get_dev() to check detected device count instead of MAX-define. This is very important for ill behaving devices. usb_dev_desc[] can be partially initialized if device probe fails. After fixing get_dev() it was easy to fix "usb part" etc commands. Previously it outputed "Unknown partition table" five times, now it's "no USB devices available". Signed-off-by: Kim B. Heino <Kim.Heino@bluegiga.com>
* fdt: Add fdt_del_node_and_alias helperKumar Gala2010-04-07-0/+13
| | | | | | | | Add a helper function that given an alias will delete both the node the alias points to and the alias itself Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Gerald Van Baren <vanbaren@cideas.com>
* Merge branch 'next'Wolfgang Denk2010-04-01-124/+420
|\
| * i2c: made unused function i2c_mux_add_device staticFrans Meulenbroeks2010-03-29-1/+1
| | | | | | | | | | | | and removed it from the .h file Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * cmd_i2c: introduced get_alen helper functionFrans Meulenbroeks2010-03-29-72/+47
| | | | | | | | | | | | | | The code to parse alen appeared 6 times in the function. Factored this out in a small helper function Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * cmd_i2c: moved a define to before the functionsFrans Meulenbroeks2010-03-29-2/+2
| | | | | | | | Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * cmd_i2c: moved mispositioned comment for i2c mdFrans Meulenbroeks2010-03-29-4/+4
| | | | | | | | Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * cmd_i2c.c: declared local functions as staticFrans Meulenbroeks2010-03-29-14/+14
| | | | | | | | | | | | Declared all functions that were not called outside the file as static Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * Merge remote branch 'origin/master' into nextWolfgang Denk2010-03-29-6/+22
| |\
| * \ Merge branch 'next' of git://git.denx.de/u-boot-coldfire into nextWolfgang Denk2010-03-28-2/+2
| |\ \
| | * | fix cmd_bdinfo.c:354: warning: 'print_eth' defined but not usedPhilippe De Muyter2010-03-24-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warnings when running MAKEALL for coldfire : cmd_bdinfo.c:354: warning: 'print_eth' defined but not used Signed-off-by: Philippe De Muyter <phdm at macqel.be>
| * | | cmd_nand: show nand scrub confirmation characterFlorian Fainelli2010-03-23-2/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When issuing a nand scrub command, the entered character is not displayed this may be confusing. This patch makes the input character being displayed if it is a 'y' so that an user knows he is about to scrub his nand. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
| * | Merge remote branch 'origin/master' into nextWolfgang Denk2010-03-21-4/+8
| |\ \
| * | | fdt_support: add partitions fixup in mtd nodeAnatolij Gustschin2010-03-21-1/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow overwriting defined partitions in the device tree blob using partition info defined in the 'mtdparts' environment variable. Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Gerald Van Baren <vanbaren@cideas.com>
| * | | cmd history: Match history buffer size to console bufferJohn Schmoller2010-03-21-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match history buffer size to console buffer size. History buffer size was hard coded to 256, artificially limiting the command buffer size. The history buffer now tracks CONFIG_SYS_CBSIZE. Signed-off-by: John Schmoller <jschmoller@xes-inc.com>
| * | | console: Fix console buffer overrunJohn Schmoller2010-03-21-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CONFIG_SYS_CBSIZE equals MAX_CMDBUF_SIZE, a command string of maximum length will overwrite part of the history buffer, causing the board to die. Expand the console_buffer and hist_lines buffer by one character each to hold the missing NULL char. Signed-off-by: John Schmoller <jschmoller@xes-inc.com>
| * | | cmd_setexpr: allow memory addresses in expressionsFrans Meulenbroeks2010-03-21-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add functionality to use memory addresses in expressions. This increases the power of expressions substantially It adheres to the standard convemtions: memory addresses can be given in the format *address (e.g. *1000) Rationale for this change is that it allows masking off bits from a byte that is obtained by reading data from e.g. i2c. Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Fix warning: control reaches end of non-void function Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | cmd_i2c.c: added i2c read to memory functionFrans Meulenbroeks2010-03-21-1/+59
| | | | | | | | | | | | | | | | Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * | | cmd_i2c.c: sorted commands alphabeticallyFrans Meulenbroeks2010-03-21-6/+5
| | | | | | | | | | | | | | | | Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * | | cmd_i2c.c: reworked subcommand handlingFrans Meulenbroeks2010-03-21-32/+45
| | | | | | | | | | | | | | | | Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * | | cmd_bootm.c: made subcommand array staticFrans Meulenbroeks2010-03-21-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| * | | cmd_i2c.c: reduced subaddress length to 3 bytesFrans Meulenbroeks2010-03-21-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to some of the comments the subaddress length is 1 or 2, but we are being prepared for the case it becomes 3. However the code also accepted 4. This repairs this by changing the constand 4 to 3. Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
* | | | bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt"Heiko Schocher2010-03-29-1/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Booting a "Multi-File Image" including a linux kernel, ramdisk and fdt, generated with mkimage -A ppc \ -O linux \ -T multi \ -C gzip \ -a 00000000 \ -e 00000000 \ -n "kernel-2.6+initrd+dtb" \ -d "vmlinux.bin.gz:ramdisk_image.gz:board.dtb" \ multi.bin actually fails, because ramdisk start and end addresses didn;t get initialized. This patch fixes this issue. Tested on the KUP4K board. Signed-off-by: Heiko Schocher <hs@denx.de>
* | | cmd_usb.c: print debug messages only when DEBUG is definedWolfgang Denk2010-03-28-2/+2
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | lcd: make 16bpp workAlessandro Rubini2010-03-24-4/+20
| |/ |/| | | | | | | | | | | | | | | Support for 16bpp was supposed to be in the code but was not working. This makes it work and has been tested in the nhk8815 board. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | console.c: fix problem with splashimageAnatolij Gustschin2010-03-21-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a board uses cfb_console driver and splash image and also defines CONFIG_SILENT_CONSOLE, the user is locked out even if "silent" is not set. It is not possible to get any output, neither on vga console device nor on serial console after redirecting the output to the serial console, since the GD_FLG_SILENT flag remains set. Fix the problem by redirecting the output from frame buffer to serial console if splashimage is used. Only suppress the output if "silent" environment variable was set and don't set the GD_FLG_SILENT flag arbitrarily. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | cmd_mmc remove \nFrans Meulenbroeks2010-03-21-1/+1
|/ | | | | | | | This patch removes the \n after the help message for mmcinfo. This resulted in an empty line being displayed after the mmcinfo line when the help command was given. Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
* Prepare v2010.03-rc1v2010.03-rc1Wolfgang Denk2010-03-12-2/+1
| | | | | | Coding style cleanup, update CHANGELOG. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Cosmetic change - indentation correction.Michael Zaidman2010-03-12-2/+2
| | | | Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
* cmd_mtdparts.c: prevent printbuffer overflowsAnatolij Gustschin2010-03-12-2/+8
| | | | | | | | | The length of configured MTDPARTS_DEFAULT string could be greater than console printbuffer size. Replace printf() by puts() to avoid potential buffer overflows. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* Move CONFIG_UPDATE_TFTP code after CONFIG_PREBOOTWolfgang Denk2010-03-11-4/+4
| | | | | | | | | | | | The auto-update feature (CONFIG_UPDATE_TFTP) requires that the env variable serverip be set for the TFTP access. If DHCP is to be used to get the serverip env variable, this doesn't work as DHCP happens after the auto-update attempt has run. A solution is to run DHCP in PREBOOT, but even this is too late. To solve this, we move update_tftp() below the PREBOOT stuff. Signed-off-by: Wolfgang Denk <wd@denx.de>
* PPC: Record U-Boot's relocated address in RAM and show in bdinfo.Richard Retanubun2010-03-11-0/+1
| | | | | | | | | | | This patch uses gd->relocaddr variable to store uboot's relocated address in RAM and shows it in bdinfo command. This patch moves CONFIG_AMIGAONEG3SE style copying of the address in board_init_f to just before relocation is actually done. Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com> Tested-by: Detlev Zundel <dzu@denx.de>
* cmd_itest.c: fix pointer dereferencingFrans Meulenbroeks2010-02-24-2/+7
| | | | | | | | fix pointer dereferencing if the size is .b and .w an 8 or 16 bit access is done. Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Acked-by: Detlev Zundel <dzu@denx.de>
* net: Use 0.5 sec timeout in miiphy_reset() instead of counting loopStefan Roese2010-02-06-6/+6
| | | | | | | | | | | | | This patch fixes a problem I've notived on a buggy PPC4xx system. This system has problems with the PHY MDIO communication and seemed to be stuck/crashed in miiphy_reset(). But degugging revealed, that the CPU didn't crash, but "only" hung in this counting loop for about 2 minutes. This patch now uses a real timeout of 0.5 seconds (as mentioned in the comment in miiphy_reset). Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* USB: usb_control_msg wait for driver ISR to set status.Remy Bohmer2010-02-03-7/+12
| | | | | | | | | This patch changes usb_control_msg back to the state prior to commit 48867208444cb2a82e2af9c3249e90b7ed4a1751. The USB driver ISR routine may update the status. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2010-02-03-0/+7
|\
| * env_nand.c: print error message and fail gracefullyWolfgang Denk2010-01-27-0/+7
| | | | | | | | | | | | | | | | | | env_nand.c would crash silently if a malloc() for the environment buffers failed; make it print an error message and fail gracefully, i. e. use the default environment then. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: John Rigby <jcrigby@gmail.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2010-02-03-8/+0
|\ \
| * | lcd: remove CONFIG_ATMEL_LCD ifdefs from lcd_setfgcolorAnatolij Gustschin2010-01-27-8/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | Not all boards defining LCD_COLOR16 are able to set lcd_color_fg/lcd_color_bg correctly. The issue seems to be caused by CONFIG_ATMEL_LCD ifdefs in lcd_setfgcolor() and lcd_setbgcolor(). Actually, the color values passed to these functions are already correct, we don't need to fix them. So remove ifdefs here. Reported-by: Alessandro Rubini <rubini@unipv.it> Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | cmd_ximg.c: fix error: 'i' undeclaredWolfgang Denk2010-01-31-14/+19
|/ | | | | | | | | | | Fix compile error: cmd_ximg.c: In function 'do_imgextract': cmd_ximg.c:234: error: 'i' undeclared (first use in this function) cmd_ximg.c:234: error: (Each undeclared identifier is reported only once cmd_ximg.c:234: error: for each function it appears in.) Signed-off-by: Wolfgang Denk <wd@denx.de>
* Add support to disable cpu's in multicore processorsKumar Gala2010-01-26-0/+3
| | | | | | | | | | | Add a disable sub-command to the cpu command that allows for disabling cores in multicore processors. This can be useful for systems that are using multicore chips but aren't utilizing all the cores as a way to reduce power and possibly improve performance. Also updated an added missing copyright. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* add ability to handle compressed images to imxtractWolfgang Wegner2010-01-26-7/+85
| | | | | | | | imxtract currently can not handle compressed images. This patch adds handling for bzip2 and zip compression. In both cases, a destination address has to be specified for extraction. Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
* jffs2: fix hangs/crashs when not using CONFIG_JFFS2_PART_SIZEMike Frysinger2010-01-26-2/+2
| | | | | | | | | | Commit b5b004ad8a0ac6f98bd5708ec8b22fbddd1c1042 caused the sector_size to be calculated incorrectly when the part size was not hardcoded. This is because the new code relied on part->size but tried to do the calculation before it was initialized properly, and it did not take into consideration the magic SIZE_REMAINING define. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* gzip/zlib: make features optionalMike Frysinger2010-01-26-0/+2
| | | | | | | | If you really want to slim down U-Boot and you would rather use a higher compression scheme (like LZMA), it'd be nice to disable gzip/zlib since these code bases take up a significant amount of space. Signed-off-by: Mike Frysinger <vapier@gentoo.org>