summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge remote branch 'u-boot-avr32/master'Wolfgang Denk2008-06-03-564/+817
|\
| * avr32: Fix theoretical race in udelay()Haavard Skinnemoen2008-05-27-9/+7
| | | | | | | | | | | | | | | | | | | | | | If the specified delay is very short, the cycle counter may go past the "end" time we are waiting for before we get around to reading it. Fix it by checking the different between the cycle count "now" and the cycle count at the beginning. This will work as long as the delay measured in number of cycles is below 2^31. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Compile atmel_mci.o conditionallyHaavard Skinnemoen2008-05-27-5/+1
| | | | | | | | | | | | | | Remove #ifdef CONFIG_MMC from the source file and use conditional compilation in the Makefile instead. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Fix wrong error flags in atmel_mci driverHaavard Skinnemoen2008-05-27-1/+1
| | | | | | | | | | | | | | | | Make sure we check for CRC errors when sending commands that use CRC checking. Reported-by: Gururaja Hebbar K R <gururajakr@sanyo.co.in> Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Fix two warnings in atmel_mci.cHaavard Skinnemoen2008-05-27-2/+4
| | | | | | | | | | | | The warnings are harmless but annoying. Let's fix them. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Rework SDRAM initialization codeHaavard Skinnemoen2008-05-27-120/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the SDRAM initialization and related code a bit, and allows faster booting. * Add definitions for EBI and internal SRAM to asm/arch/memory-map.h * Remove memory test from sdram_init() and make caller responsible for verifying the SDRAM and determining its size. * Remove base_address member from struct sdram_config (was sdram_info) * Add data_bits member to struct sdram_config and kill CFG_SDRAM_16BIT * Add support for a common STK1000 hack: 16MB SDRAM instead of 8. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Do stricter stack checking in the exception handlerHaavard Skinnemoen2008-05-27-1/+2
| | | | | | | | | | | | | | Don't do a stack dump if the stack pointer is outside the memory area reserved for stack. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Use the same entry point for reset and exception handlingHaavard Skinnemoen2008-05-27-74/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the reset vector is always aligned to a very large boundary, we can save a couple of KB worth of alignment padding by placing the exception vectors at the same address. Deciding which one it is is easy: If we're handling an exception, the CPU is in Exception mode. If we're starting up after reset, the CPU is in Supervisor mode. So this adds a very minimal overhead to the reset path (only executed once) and the exception handling path (normally never executed at all.) Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Put memset in its own sectionHaavard Skinnemoen2008-05-27-1/+1
| | | | | | | | | | | | | | | | All C code is compiled with -ffunction-sections -fdata-sections. Assembly functions should get their own sections as well so that everything looks consistent. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Rename pm_init() as clk_init() and make SoC-specificHaavard Skinnemoen2008-05-27-44/+76
| | | | | | | | | | | | | | | | pm_init() was always more about clock initialization than anything else. Dealing with PLLs, clock gating and such is also inherently SoC-specific, so move it into a SoC-specific directory. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Use new-style Makefile for the at32ap platformHaavard Skinnemoen2008-05-27-7/+14
| | | | | | | | | | | | This makes it easier to avoid compiling certain files later. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Remove unused file cpu/at32ap/pm.cHaavard Skinnemoen2008-05-27-42/+0
| | | | | | | | Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Clean up the HMATRIX codeHaavard Skinnemoen2008-05-27-238/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | Rework the HMATRIX configuration interface so that it becomes easier to configure the HMATRIX for boards with special needs, and add new parts. The HMATRIX header file has been split into a general, chip-independent part with register definitions, etc. and a chip-specific part with SFR bitfield definitions and master/slave identifiers. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Add support for the ATSTK1006 boardHaavard Skinnemoen2008-05-27-0/+227
| | | | | | | | | | | | | | This is a replacement for ATSTK1002 with 64MB SDRAM and NAND flash on board. It's currently in production and will be available soon. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Get rid of the .flashprog sectionHaavard Skinnemoen2008-05-27-32/+3
| | | | | | | | | | | | | | | | | | | | | | | | The .flashprog section was only needed back when we were running directly from flash, and it's even more useless on NGW100 since it uses the CFI flash driver which never used this workaround in the first place. Remove it on STK1000 as well, and get rid of all the associated code and annotations. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Use correct condition around macb clock accessorsHaavard Skinnemoen2008-05-27-1/+1
| | | | | | | | | | | | | | get_macb_pclk_rate() and get_macb_hclk_rate() should be available when the chip has a MACB controller, not when it has a USART. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: Disable the AP7000 internal watchdog on startupDavid Brownell2008-05-27-0/+4
| | | | | | | | | | | | | | | | | | This patch forces the watchdog off in all cases. That will at least get rid of the constant reboot cycle, though it won't let the watchdog actually run in the new kernels: its probe() comes up with a polite warning. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * avr32: stk1002 and ngw100 convergenceDavid Brownell2008-05-27-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Make STK1002 and NGW100 boards act more alike: - STK boards can use as many arguments as NGW - STK boards don't need to manage FPGAs either - NGW commands should match STK ones Also spell U-Boot right in prompts for STK1002 and NGW100. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> [haavard.skinnemoen@atmel.com: update STK100[34] as well] Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
* | Merge remote branch 'u-boot-nand-flash/master'Wolfgang Denk2008-06-03-20/+20
|\ \
| * | Remove prototypes of nand_init() in favor of including nand.h.Scott Wood2008-05-28-12/+4
| | | | | | | | | | | | | | | | | | Likewise with onenand_init(). Signed-off-by: Scott Wood <scottwood@freescale.com>
| * | Make onenand_uboot.h self-sufficient.Scott Wood2008-05-28-0/+5
| | | | | | | | | | | | | | | | | | Don't assume types are provided by previously included headers. Signed-off-by: Scott Wood <scottwood@freescale.com>
| * | nand: Correct NAND erase percentage outputDirk Behme2008-05-28-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For NAND erase sizes smaller than one NAND erase block, erase percentage output becomes grater than 100% e.g. -- cut -- > nand info Device 0: NAND 64MiB 1,8V 8-bit, sector size 16 KiB > nand erase 0x100000 0x2000 NAND erase: device 0 offset 0x100000, size 0x2000 Erasing at 0x100000 -- 200% complete. OK > -- cut -- Correct this and give user a warning that more is erased than specified: -- cut -- > nand erase 0x100000 0x2000 NAND erase: device 0 offset 0x100000, size 0x2000 Warning: Erase size 0x00002000 smaller than one erase block 0x00004000 Erasing 0x00004000 instead Erasing at 0x100000 -- 100% complete. OK > -- cut -- Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
| * | Cleanup nand_info[] declaration.Stelian Pop2008-05-28-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The nand_info array is declared as extern in several .c files. Those days, nand.h contains a reference to the array, so there is no need to declare it elsewhere. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * | NAND: Provide a sane default for NAND_MAX_CHIPS.Scott Wood2008-05-28-0/+4
| |/ | | | | | | | | | | | | This allows the header to be included regardless of whether a board's config file provides NAND-related defininitions. Signed-off-by: Scott Wood <scottwood@freescale.com>
* | Merge remote branch 'u-boot-mips/master'Wolfgang Denk2008-06-03-305/+1278
|\ \
| * | mips: Add an 'include/asm/errno.h', like all other architecturesJason McMullan2008-05-30-0/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | All other u-boot architectures have an include/asm/errno.h, so this change adds it to the mips include/asm-mips headers also. Stolen from Linux 2.6.25. Signed-off-by: Jason McMullan <mcmullan@netapp.com>
| * | [MIPS] <asm/mipsregs.h>: Update coprocessor register access macrosShinya Kuribayashi2008-05-30-136/+836
| | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | [MIPS] <asm/mipsregs.h>: Update register / bit field definitionsShinya Kuribayashi2008-05-30-111/+225
| | | | | | | | | | | | Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | [MIPS] <asm/mipsregs.h>: CodinygStyle cleanupsShinya Kuribayashi2008-05-30-140/+143
| | | | | | | | | | | | | | | | | | No functional changes. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | mips: If CONFIG_CMD_SPI is defined, call spi_init()Jason McMullan2008-05-30-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mips architecture currently does not call 'spi_init()' in the generic board initialization routine is CONFIG_CMD_SPI is defined. This patch rectifies that problem. Signed-off-by: Jason McMullan <mcmullan@netapp.com> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | [MIPS] lib_mips/board.c: Add nand_initJason McMullan2008-05-30-0/+6
| |/ | | | | | | | | | | | | | | This patch adds the standard 'nand_init()' call to the mips generic 'board_init_r()' call, bringing MIPS in line with the other architectures. Signed-off-by: Jason McMullan <mcmullan@netapp.com> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | Merge remote branch 'u-boot-ppc4xx/master'Wolfgang Denk2008-06-02-0/+686
|\ \ | |/ |/|
| * Merge branch 'quad100hd'Stefan Roese2008-05-21-0/+686
| |\
| | * ppc4xx: QUAD100HD: Allow the environment to be put into flash.Gary Jennejohn2008-05-14-4/+9
| | | | | | | | | | | | | | | | | | | | | After moving TEXT_BASE the value for CFG_ENV_ADDR was incorrect. Also use a redundant environment. Signed-off-by: Gary Jennejohn <garyj@denx.de>
| | * ppc4xx: Add the Harris QUAD100HD AMCC 405EP-based boardGary Jennejohn2008-05-08-0/+681
| | | | | | | | | | | | | | | Signed-off-by: Gary Jennejohn <garyj@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-05-27-48/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/configs/socrates.h Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | USB: replace old swap_ with proper endianess conversion macrosChristian Eggers2008-05-22-45/+38
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christian Eggers <ceggers@gmx.de> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
| * | | Fix endianess conversion in usb_ohci.cChristian Eggers2008-05-22-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christian Eggers <ceggers@gmx.de> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
| * | | USB: add support for multiple PCI OHCI controllersSergei Poselenov2008-05-22-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new configuration variable CONFIG_PCI_OHCI_DEVNO. In case of several PCI USB controllers on a board this variable specifys which controller to use. Also add USB support for sokrates board. See doc/README.generic_usb_ohci for details. Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> Signed-off-by: Markus Klotzbuecher <mk@denx.de>
* | | | Socrates: Added USB support.Sergei Poselenov2008-05-27-9/+12
| | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | | USB: add new configuration variable CONFIG_PCI_OHCI_DEVNOSergei Poselenov2008-05-27-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of several PCI USB controllers on a board this variable specifys which controller to use. See doc/README.generic_usb_ohci for details. Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | | Socrates: add support for DS75 Digital Thermo Sensor on I2C bus.Sergei Poselenov2008-05-27-1/+11
| | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | | Socrates: Config file cleanup.Sergei Poselenov2008-05-27-3/+4
|/ / / | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-testingWolfgang Denk2008-05-21-9/+9
|\ \ \
| * | | Fix some whitespace issuesWolfgang Denk2008-05-21-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | introduced by 53677ef18 "Big white-space cleanup." Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | | Merge branch 'socrates' of /home/wd/git/u-boot/projectsWolfgang Denk2008-05-21-9/+1160
|\ \ \ \
| * | | | socrates: fix second TSEC configuration (it is actually TSEC3)Sergei Poselenov2008-05-20-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
| * | | | Fixed reset for socratesSergei Poselenov2008-05-20-9/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
| * | | | socrates: changes to support FDTSergei Poselenov2008-05-20-33/+50
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | Initial support for "Socrates" boardSergei Poselenov2008-05-20-0/+1129
| | |/ / | |/| | | | | | | | | | Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>