summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* mpc8641: Make PCI and RIO mutually exclusive, fix non-PCI buildBecky Bruce2008-11-03-17/+38
| | | | | | | | | | You can't actually have both, and with some coming changes to change the memory map for the board and support 36-bit physical, we need the extra BAT that is being consumed by having both. I also make non-PCI configs build cleanly, for the sake of sanity. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* mpc8641: Stop supporting non-PCI_PNP configsBecky Bruce2008-11-03-27/+1
| | | | | | | We don't actually ever do this, remove the code so we can stop maintaining it. Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
* Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2008-11-01-79/+67
|\
| * NAND: Allow NAND and OneNAND to coexistAlessandro Rubini2008-10-31-69/+1
| | | | | | | | | | | | | | | | | | | | This removes in nand.h code that is verbatim duplicated from bbm.h, including directly bbm.h in nand.h. The previous state of affairs prevented compiling code for a board hosting both NAND and OneNAND chips. Reported-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Alessandro Rubini <rubini@unipv.it> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * JFFS2: Eliminate compiler error when both NAND and OneNAND are enabled.Scott Wood2008-10-31-7/+5
| | | | | | | | | | Reported-by: Alessandro Rubini <rubini-list@gnudd.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * NAND: Add NAND support for MPC8536DS boardJason Jin2008-10-31-2/+60
| | | | | | | | | | | | | | | | | | | | This patch defines 1M TLB&LAW size for NAND on MPC8536DS, assigns 0xffa00000 for CONFIG_SYS_NAND_BASE and adds other NAND supports in config file. It also moves environment(CONFIG_ENV_ADDR) outside of u-boot image. Singed-off-by: Jason Jin <Jason.Jin@freescale.com> Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * NAND: Fix CONFIG_ENV_ADDR for MPC8572DSHaiying Wang2008-10-31-1/+1
| | | | | | | | | | | | | | CONFIG_ENV_ADDR should be (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE). Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2008-11-01-7/+7
|\ \
| * | sh: rsk7203: Moved rsk7203 board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: MigoR: Moved MigoR board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: r2dplus: Moved r2dplus board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: sh7763rdp: Moved sh7763rdp board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: sh7785lcr: Moved sh7785lcr board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: r7780mp: Moved r7780mp board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | sh: ap325rxa: Moved ap325rxa board to board/renesasNobuhiro Iwamatsu2008-10-31-1/+1
| |/ | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2008-11-01-1/+2
|\ \
| * | CFI Driver: Fix "flash not ready" problemWolfgang Denk2008-10-31-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem on systems where the NOR flash is attached to a 64 bit bus. The toggle bit detection in flash_toggle() is based on the assumption that the same flash address is read twice without any other interjacent flash accesses. However, on 32 bit systems the function flash_read64() [as currently implemented] does not perform an atomic 64 bit read - instead, this is broken down into two 32 bit read accesses on addresses "addr" and "addr + 4". So instead of reading a 64 bit value twice from "addr", we see a sequence of 4 32 bit reads from "addr", "addr + 4", "addr", and "addr + 4". The consequence is that flash_toggle() fails to work. This patch implements a simple, but somewhat ugly solution, as it avoids the use of flash_read64() in this critical place (by breaking it down manually into 32 bit read operations) instead of rewriting flash_read64() such to perform atomic 64 bit reads as one could expect. However, such a rewrite would require the use of floating point load operations, which becomes pretty complex: save MSR; set Floating Point Enable bit in MSR; use "lfd" instruction to perform atomic 64 bit read; use "stfd" to store value to temporary variable on stack; load u64 value from temporary variable; restore saved MSR; return u64 value; The benefit-cost ratio of such an implementation was considered too bad to actually attempt this, especially as we can expect that such an implementation would not only have a bigger memory footprint but also cause a performance degradation. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2008-11-01-284/+372
|\ \ \
| * | | ppc4xx: Fix spelling error in MAINTAINERS fileStefan Roese2008-10-31-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Update PMC440 board supportMatthias Fuchs2008-10-31-22/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch brings PMC440 board support up to date: - fix GPIO configuration - add misc_init_f() - use better values for usbact variable - fix USB 2.0 phy reset sequence - shrink BAR2 to save PCI address space - add FDT support Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Fix PMC440 BSP commandsMatthias Fuchs2008-10-31-33/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the PMC440 BSP commands painit and selfreset Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Update PMC440 board configurationMatthias Fuchs2008-10-31-27/+43
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Fix esd loadpci commandMatthias Fuchs2008-10-31-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes esd's loadpci command when not all memory on adapter boards is accessable via PCI. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Clean up PMC440 headerMatthias Fuchs2008-10-31-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Codingstyle cleanup -Remove unused GPIO define Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Handle other board variant in PMC440 FPGA codeMatthias Fuchs2008-10-31-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Merge xilinx-ppc440 and xilinx-ppc405 cfgRicardo Ribalda Delgado2008-10-31-179/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xilinx ppc440 and ppc405 have many similarities. This patch merge the config files of both infrastuctures Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: Correctly configure the GPIO pin muxing on ArchesStefan Roese2008-10-31-1/+11
| |/ / | | | | | | | | | | | | | | | | | | Arches doesn't use PerCS3 but GPIO43, so let's configure the GPIO pin multiplexing correctly Signed-off-by: Stefan Roese <sr@denx.de>
* | | Merge branch 'master' of git://git.denx.de/u-boot-fdtWolfgang Denk2008-11-01-6/+12
|\ \ \
| * | | libfdt: Fix bug in fdt_subnode_offset_namelen()David Gibson2008-10-30-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's currently an off-by-one bug in fdt_subnode_offset_namelen() which causes it to keep searching after it's finished the subnodes of the given parent, and into the subnodes of siblings of the original node which come after it in the tree. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | | fdt_resize(): ensure minimum paddingPeter Korsgaard2008-10-30-2/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | fdt_add_mem_rsv() requires space for a struct fdt_reserve_entry (16 bytes), so make sure that fdt_resize at least adds that much padding, no matter what the location or size of the fdt is. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Acked-by: Andy Fleming <afleming@freescale.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2008-11-01-805/+427
|\ \ \ | |_|/ |/| |
| * | Blackfin: fix up UART status bit handlingMike Frysinger2008-10-23-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | Some Blackfin UARTs are read-to-clear while others are write-to-clear. This can cause problems when we poll the LSR and then later try and handle any errors detected. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf561-ezkit: drop redundant codeMike Frysinger2008-10-23-4/+2
| | | | | | | | | | | | | | | | | | Common Blackfin code already announces CPU information. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf561-ezkit: drop pointless USB codeMike Frysinger2008-10-23-15/+0
| | | | | | | | | | | | | | | | | | | | | The USB/LAN register settings are not actually used/needed in order to drive things from U-Boot, so drop the code. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: linker scripts: force start.o and set initcode boundariesMike Frysinger2008-10-23-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that the start.o object is always the first object in our linker script regardless of configuration settings, and add some linker symbols so the ldr utility can properly locate the initcode when generating a LDR. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: small cpu init optimization while setting interrupt maskMike Frysinger2008-10-23-5/+2
| | | | | | | | | | | | | | | | | | | | | Use the sti instruction to set the initial interrupt mask rather than banging on the core IMASK MMR to save both space and time. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: set initial stack correctly according to Blackfin ABIMike Frysinger2008-10-23-3/+3
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: make baud calculation more accurateMike Frysinger2008-10-23-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | We should use the algorithm in the Linux kernel so that the UART divisor calculation is more accurate. It also fixes problems on some picky UARTs that have sampling anomalies. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: decode hwerrcause/excause when crashingMike Frysinger2008-10-23-2/+40
| | | | | | | | | | | | | | | | | | Having to decode hwerrcause/excause values is a pain, so automate it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: fix register dump messagesMike Frysinger2008-10-23-1/+5
| | | | | | | | | | | | | | | | | | Make sure we report RETI/IPEND correctly. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: don't bother displaying reboot msg when crashingMike Frysinger2008-10-23-5/+1
| | | | | | | | | | | | | | | | | | | | | The hang function already tells you to reboot, so no point in showing it twice. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: enable support for nested interruptsMike Frysinger2008-10-23-4/+10
| | | | | | | | | | | | | | | | | | | | | During cpu init, make sure we initialize the CEC properly so that interrupts can fire and be handled while U-Boot is running. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: init NAND before relocating envMike Frysinger2008-10-23-5/+5
| | | | | | | | | | | | | | | | | | | | | If booting out of NAND, we need to make sure we initialize it properly before attempting to relocate the environment. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: check cache bits, not cplb bitsMike Frysinger2008-10-23-2/+2
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: drop unused cache flush codeMike Frysinger2008-10-23-231/+1
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: unify cache handling codeMike Frysinger2008-10-23-35/+35
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: only initialize the RTC when actually usedMike Frysinger2008-10-23-13/+10
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: fix SWRST register definitionMike Frysinger2008-10-23-9/+9
| | | | | | | | | | | | | | | | | | The SWRST register is a 16bit, not 32bit, register. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: build with -fomit-frame-pointerMike Frysinger2008-10-23-1/+1
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: document some of the blackfin directoriesMike Frysinger2008-10-23-0/+2
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>