summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*Peter Tyser2010-04-13-30/+30
| | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* m68k: Move cpu/$CPU to arch/m68k/cpu/$CPUPeter Tyser2010-04-13-88/+88
| | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* arm: Move cpu/$CPU to arch/arm/cpu/$CPUPeter Tyser2010-04-13-56/+56
| | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* sh: Move cpu/$CPU to arch/sh/cpu/$CPUPeter Tyser2010-04-13-4/+4
| | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* ppc: Move cpu/$CPU to arch/ppc/cpu/$CPUPeter Tyser2010-04-13-387/+392
| | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Move architecture-specific includes to arch/$ARCH/include/asmPeter Tyser2010-04-13-11/+9
| | | | | | | | This helps to clean up the include/ directory so that it only contains non-architecture-specific headers and also matches Linux's directory layout which many U-Boot developers are already familiar with. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>"Peter Tyser2010-04-13-36/+36
| | | | | | | | | | The appropriate include/asm-$ARCH directory should already by symlinked to include/asm so using the whole "asm-$ARCH" path is unnecessary. This change should also allow us to move the include/asm-$ARCH directories into their appropriate lib/$ARCH/ directories. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Move libfdt/ into lib/Peter Tyser2010-04-13-7/+7
| | | | | | | Move the libfdt directory into the common lib/ directory to clean up the top-level directory. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Rename lib_generic/ to lib/Peter Tyser2010-04-13-321/+321
| | | | | | | | Now that the other architecture-specific lib directories have been moved out of the top-level directory there's not much reason to have the '_generic' suffix on the common lib directory. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Move lib_$ARCH directories to arch/$ARCH/libPeter Tyser2010-04-13-232/+232
| | | | | | | | | Also move lib_$ARCH/config.mk to arch/$ARCH/config.mk This change is intended to clean up the top-level directory structure and more closely mimic Linux's directory organization. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Change directory-specific CFLAGS to use full pathPeter Tyser2010-04-13-25/+30
| | | | | | | | | | | | | | | | | | Previously, a specific file or directory could be compiled with custom CFLAGS by adding a Makefile variable such as: CFLAGS_dlmalloc.o = <custom flags for common/dlmalloc.c> or CFLAGS_lib = <custom flags for lib directory> This method breaks down once multiple files or directories share the same path. Eg FLAGS_fileA = <custom flags> would incorrectly result in both dir1/fileA.c and dir2/fileA.c being compiled with <custom flags>. This change allows finer grained control which we need once we move lib_$ARCH to arch/$ARCH/lib/ and lib_generic/ to lib/. Without this change all lib/ directories would share the same custom CFLAGS. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Create CPUDIR variablePeter Tyser2010-04-13-32/+33
| | | | | | | | | | | | The CPUDIR variable points to the location of a target's CPU directory. Currently, it is set to cpu/$CPU. However, using $CPUDIR will allow for more flexibility in the future. It lays the groundwork for reorganizing U-Boot's directory structure to support a layout such as: arch/$ARCH/cpu/$CPU/* (architecture with multiple CPU types) arch/$ARCH/cpu/* (architecture with one CPU type) Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2010-04-10-251/+453
|\
| * Blackfin: IP04: new board portBrent Kandetzki2010-04-07-1/+294
| | | | | | | | | | | | | | A low cost 4 port IP-PBX board. Signed-off-by: Brent Kandetzki <BrentK@teleco.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: drop bfin #undef in linker scriptMike Frysinger2010-04-07-2/+1
| | | | | | | | | | | | | | Now that the linker script is preprocessed with -ansi, there is no need to manually undef the bfin define. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: call watchdog_init() for external watchdogsMike Frysinger2010-04-07-0/+6
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: link with normal ABI targetMike Frysinger2010-04-07-2/+2
| | | | | | | | | | | | | | | | | | If someone uses the FDPIC toolchain to compile U-Boot, make sure the linker knows to use the normal ABI target rather than the FDPIC one. This wasn't needed with older toolchains, but when we fixed the linker such that the default target changed based on tuple, this broke. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: sync ptrace headers with linuxMike Frysinger2010-04-07-233/+126
| | | | | | | | | | | | Scrub a lot of dead cruft in the process. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: cm-bf561: update network/env settingsHarald Krapfenbauer2010-04-07-9/+6
| | | | | | | | | | | | | | Switch to the SMC911X driver by default now, and fix LDR env settings. Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf537-stamp: add board test definesMike Frysinger2010-04-07-0/+9
| | | | | | | | | | | | We tweak the configs a little when doing automated hardware tests. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: relax .data alignmentMike Frysinger2010-04-07-1/+1
| | | | | | | | | | | | | | The strictest alignment on Blackfin systems is 32bits (since that is the largest load instruction), so don't force 256byte alignment here. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: drop reference to gd->reloc_offMike Frysinger2010-04-07-3/+5
| | | | | | | | | | | | | | | | | | The reloc_off member no longer exists, so drop it. Also change this function so that it is always compiled and prevents latent issues like this in the future. Reported-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: disable NetBSD bootm support by defaultMike Frysinger2010-04-07-0/+3
| | | | | | | | | | | | | | There is no Blackfin/NetBSD port, so enabling support for it by default doesn't make any sense. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | 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>
* | config_cmd_all.h: Sort entries alphabeticallyDetlev Zundel2010-04-10-3/+3
| | | | | | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* | config_cmd_all.h: added missing CONFIG_CMD_UBI and CONFIG_CMD_UBIFSFrans Meulenbroeks2010-04-10-0/+2
| | | | | | | | Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
* | 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>
* | mkimage: Fix strict-aliasing compiler warningPeter Tyser2010-04-10-5/+3
| | | | | | | | | | | | | | | | | | Version 4.2.4 of gcc produces the following warnings without this change: mkimage.c: In function ‘main’: mkimage.c:204: warning: dereferencing type-punned pointer will break strict-aliasing rules mkimage.c:222: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | Add initial support for Matrix Vision mvSMR board based on MPC5200B.Andre Schwarz2010-04-10-1/+1088
| | | | | | | | Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
* | 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>
* | drivers/mtd/spi/eeprom_m95xxx.c: add missing error checkingAlbin Tonnerre2010-04-09-0/+6
| | | | | | | | Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
* | 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>
* | | Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2010-04-09-26/+32
|\ \ \
| * | | 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>
| * | | EHCI: add NEC PCI IDSergei Shtylyov2010-04-08-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add NEC EHCI controller to the list of the supported devices. Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com> drivers/usb/host/ehci-pci.c | 1 + 1 file changed, 1 insertion(+)
| * | | EHCI: fix port reset reportingSergei Shtylyov2010-04-08-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b416191a14770c6bcc6fd67be7decf8159b2baee (Fix EHCI port reset.) didn't move the code that checked for successful clearing of the port reset bit from ehci_submit_root(), relying on wait_ms() call instead. The mentioned code also erroneously reported port reset state when the reset was already completed. Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
| * | | EHCI: fix off-by-one error in ehci_submit_root()Sergei Shtylyov2010-04-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | USB devices on the 2nd port are not detected and I get the following message: The request port(1) is not configured That's with default CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS value of 2. 'req->index' is 1-based, so the comparison in ehci_submit_root() can't be correct. Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
| * | | EHCI: fix root hub device descriptorSergei Shtylyov2010-04-08-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | On little endian machines, EHCI root hub's USB revision is reported as 0.2 -- cpu_to_le16() was missed in the initializer for the 'bcdUSB' descriptor field. The same should be done for the 'bcdDevice' field. Signed-off-by: Sergei Shtylyov <sshtylyov@mvista.com>
* | | video: ati_radeon_fb.c: fix warning while compiling with DEBUGAnatolij Gustschin2010-04-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes this warning: ati_radeon_fb.c: In function 'radeon_probe': ati_radeon_fb.c:598: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'void *' Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | ati_radeon: Support PCI virtual not eq bus mapping.Ed Swarthout2010-04-08-28/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use pci_bus_to_virt() to convert the bus address from the BARs to virtual address' to eliminate the direct mapping requirement. Rename variables to better match usage (_phys -> _bus or no-suffix) This fixes the mpc8572ds CONFIG_PHYS_64BIT mode failure: "videoboot: Video ROM failed to map!" Tested on mpc8572ds with and without CONFIG_PHYS_64BIT. Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
* | | ati_radeon: return with error when emulator failsEd Swarthout2010-04-08-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Console was being switched to video even if emulator fails and causing this hang: Scanning PCI bus 04 04 00 1095 3132 0104 00 PCIE3 on bus 03 - 04 Video: ATI Radeon video card (1002, 5b60) found @(2:0:0) videoboot: Booting PCI video card bus 2, function 0, device 0 videoboot: Video ROM failed to map! 640x480x8 31kHz 59Hz radeonfb: FIFO Timeout ! Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com> Tested-by: Anatolij Gustschin <agust@denx.de>
* | | video: cfb_console.c: add support for RLE8 bitmapsAnatolij Gustschin2010-04-08-2/+204
|/ / | | | | | | | | | | Allow displaying 8-bit RLE BMP images. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2010-04-08-0/+2
|\ \
| * | cfi_flash: reset timer in flash status checkThomas Chou2010-04-07-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds reset_timer() before the flash status check waiting loop. Since the timer is basically running asynchronous to the cfi code, it is possible to call get_timer(0), then only a few _SYSCLK_ cycles later an interrupt is generated. This causes timeout even though much less time has elapsed. So the timer period registers should be reset before get_timer(0) is called. There is similar usage in nand_base.c. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2010-04-08-304/+517
|\ \
| * | ppc/85xx: Use CONFIG_NS16550_MIN_FUNCTIONS to reduce NAND_SPL sizeKumar Gala2010-04-07-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MPC8536DS_NAND SPL build was failing due to code size increase introduced by commit: commit 33f57bd553edf29dffef5a6c7d76e169c79a6049 Author: Kumar Gala <galak@kernel.crashing.org> Date: Fri Mar 26 15:14:43 2010 -0500 85xx: Fix enabling of L1 cache parity on secondary cores We built in some NS16550 functions that we dont need and can get rid of them via CONFIG_NS16550_MIN_FUNCTIONS. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | p2020ds: add alternate boot bank support using the ngPIXIS FPGATimur Tabi2010-04-07-89/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Freescale P2020DS board uses a new type of PIXIS FPGA, called the ngPIXIS. The ngPIXIS has one distinct new feature: the values of the on-board switches can be selectively overridden with shadow registers. This feature is used to boot from a different NOR flash bank, instead of having a register dedicated for this purpose. Because the ngPIXIS is so different from the previous PIXIS, a new file is introduced: ngpixis.c. Also update the P2020DS checkboard() function to use the new macros defined in the header file. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl: improve the PIXIS code and fix a few bugsTimur Tabi2010-04-07-170/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and document the Freescale PIXIS code, used on most 85xx and 86xx boards. This makes the code easier to read and more flexible. Delete pixis.h, because none of the exported functions were actually being used by any other file. Make all of the functions in pixis.c 'static'. Remove "#include pixis.h" from every file that has it. Remove some unnecessary #includes. Make 'pixis_base' into a macro, so that we don't need to define it in every function. Add "while(1);" loops at the end of functions that reset the board, so that execution doesn't continue while the reset is in progress. Replace in_8/out_8 calls with clrbits_8, setbits_8, or clrsetbits_8, where appropriate. Replace ulong/uint with their spelled-out equivalents. Remove unnecessary typecasts, changing the types of some variables if necessary. Add CONFIG_SYS_PIXIS_VCFGEN0_ENABLE and CONFIG_SYS_PIXIS_VBOOT_ENABLE to make it easier for specific boards to support variations in the PIXIS registers sets. No current boards appears to need this feature. Fix the definition of CONFIG_SYS_PIXIS_VBOOT_MASK for the MPC8610 HPCD. Apparently, "pixis_reset altbank" has never worked on this board. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>