summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* powerpc: Consolidate bootcount_{store|load} for PowerPCStefan Roese2010-05-06-124/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch consolidates bootcount_{store|load} for PowerPC by implementing a common version in arch/powerpc/lib/bootcount.c. This code is now used by all PowerPC variants that currently have these functions implemented. The functions now use the proper IO-accessor functions to read/write the values. This code also supports two different bootcount versions: a) Use 2 separate words (2 * 32bit) to store the bootcounter b) Use only 1 word (2 * 16bit) to store the bootcounter Version b) was already used by MPC5xxx. Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Detlev Zundel <dzu@denx.de> Acked-by: Kim Phillips <kim.phillips@freescale.com> for 83xx parts Cc: Michael Zaidman <michael.zaidman@gmail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Kim Phillips <kim.phillips@freescale.com> Cc: Anatolij Gustschin <agust@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-i2cWolfgang Denk2010-05-06-61/+108
|\
| * Blackfin: TWI/I2C: implement multibus supportMike Frysinger2010-05-05-61/+108
| | | | | | | | | | | | | | In order to do this cleanly, the register accesses have to be converted to a C struct (base pointer), so do that in the process. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | drivers/*/Makefile: fix conditional compile rule.Ender.Dai2010-05-06-6/+4
| | | | | | | | | | | | Fix conditional compile rule for twl4030.c and videomodes.c. Signed-off-by: Ender.Dai <ender.dai@gmail.com>
* | Move test for unnecessary memmove to memmove_wd()Larry Johnson2010-05-06-5/+5
| | | | | | | | Signed-off-by: Larry Johnson <lrj@acm.org>
* | compiler.h: add uint typedefMike Frysinger2010-05-06-0/+1
| | | | | | | | | | | | | | | | | | Recent crc changes started using the "uint" type in headers that are used on the build system. This subsequently broke mingw targets as they do not provide such a type. So add this basic typedef to compiler.h so that we do not have to worry about this breaking again in the future. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | command.c: Enable auto tab for the editenv commandTrübenbach, Ralf2010-05-06-0/+3
| | | | | | | | | | | | | | Enable the auto completion (with TAB) of the environment variable name after the editenv command. Signed-off-by: Ralf Trübenbach <ralf.truebenbach@men.de>
* | 74xx_7xx: CPCI750: Add ECC support on esd CPCI-CPU/750 boardReinhard Arlt2010-05-06-8/+159
| | | | | | | | | | | | | | | | | | | | Add ECC support for DDR RAM for MV64360 on esd CPCI-CPU/750 board. This patch also adds the "pldver" command to display the CPLD revision. Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
* | sc520: Fix minor DRAM Controller Setup bugGraeme Russ2010-05-06-1/+1
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | sc520: Update to new AMD CopyrightGraeme Russ2010-05-06-40/+77
| | | | | | | | | | | | | | AMD recently changed the licensing of the RAM sizing code to the GPLv2 (or at your option any later version) Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | eNET: Implement eNET WatchdogGraeme Russ2010-05-06-9/+47
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | eNET: Use SC520 MMCR to reset eNET boardGraeme Russ2010-05-06-1/+1
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | eNET: Add PC/AT compatibility setup functionGraeme Russ2010-05-06-0/+38
| | | | | | | | | | | | | | | | The eNET uses the sc520 software timers rather than the PC/AT clones Set all interrupts and timers up to be PC/AT compatible Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | eNET: Add support for onboard RTL8100B (RTL8139) chipsGraeme Russ2010-05-06-1/+15
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | sc520: Board Specific PCI InitGraeme Russ2010-05-06-37/+36
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | sc520: Move PCI defines to PCI include fileGraeme Russ2010-05-06-29/+29
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | eNET: Fix CONFIG_SYS_HZ to be 1000Graeme Russ2010-05-06-1/+1
| | | | | | | | | | | | | | The clock interupt has always been 1kHz as per timer_init() in /arch/i386/cpu/sc520/sc520_timer.c Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | eNET: Fix Flash WriteGraeme Russ2010-05-06-1/+1
| | | | | | | | | | | | Onboard AMD Flash chip does not support buffered writes Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | sc520: Allow boards to override udelayGraeme Russ2010-05-06-0/+5
| | | | | | | | | | | | | | If the board has a high precision mico-second timer, it maked sense to use it instead of the on-chip one Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Fix support for booting bzImageGraeme Russ2010-05-06-32/+1676
| | | | | | | | | | | | | | | | | | | | | | Add support for newer (up to 2.6.33) kernels Add zboot command which takes the address of a bzImage as its first argument and (optionally) the size of the bzImage as the second argument (the second argument is needed for older kernels which do not include the bzImage size in the header) Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Provide weak PC/AT compatibility setup functionGraeme Russ2010-05-06-0/+9
| | | | | | | | | | | | | | | | | | | | It is possibly to setup x86 boards to use non-PC/AT configurations. For example, the sc520 is an x86 CPU with PC/AT and non-PC/AT peripherals. This function allows the board to set itself up for maximum PC/AT compatibility just before booting the Linux kernel (the Linux kernel 'just works' if everything is PC/AT compliant) Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Use CONFIG_SERIAL_MULTIGraeme Russ2010-05-06-516/+32
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | SERIAL: Enable port-mapped accessGraeme Russ2010-05-06-30/+39
| | | | | | | | | | | | | | | | | | The x86 architecture exclusively uses Port-Mapped I/O (inb/outb) to access the 16550 UARTs. This patch mimics how Linux selects between Memory-Mapped and Port-Mapped I/O. This allows x86 boards to use CONFIG_SERIAL_MUTLI and drop the custom serial port driver Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Fix copying of Real-Mode code into RAMGraeme Russ2010-05-06-2/+2
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Pass relocation offset into Global DataGraeme Russ2010-05-06-27/+36
| | | | | | | | | | | | | | In order to locate the 16-bit BIOS code, we need to know the reloaction offset. Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Move GDT to a safe location in RAMGraeme Russ2010-05-06-14/+103
| | | | | | | | | | | | | | | | | | Currently, the GDT is either located in FLASH or in the non-relocated U-Boot image in RAM. Both of these locations are unsafe as those locations can be erased during a U-Boot update. Move the GDT into the highest available memory location and relocate U-Boot to just below it Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Add RAM bootstrap functionalityGraeme Russ2010-05-06-12/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a parameter to the 32-bit entry to indicate if entry is from Real Mode or not. If entry is from Real Mode, execute the destructive 'sizer' routine to determine memory size as we are booting cold and running in Flash. If not entering from Real Mode, we are executing a U-Boot image from RAM and therefore the memory size is already known (and running 'sizer' will destroy the running image) There are now two 32-bit entry points. The first is the 'in RAM' entry point which exists at the start of the U-Boot binary image. As such, you can load u-boot.bin in RAM and jump directly to the load address without needing to calculate any offsets. The second entry point is used by the real-to-protected mode switch This patch also changes TEXT_BASE to 0x6000000 (in RAM). You can load the resulting image at 0x6000000 and simple go 0x6000000 from the u-boot prompt Hopefully a later patch will completely elliminate any dependency on TEXT_BASE like a relocatable linux kernel (perfect world) Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Split sc520 memory sizing versus reportingGraeme Russ2010-05-06-38/+61
| | | | | | | | | | | | | | | | This patch allows the low-level assembler boot-strap to obtain the RAM size without calling the destructive 'sizer' routine. This allows boot-strapping from a U-Boot image loaded in RAM Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Fix sc520 memory size reportingGraeme Russ2010-05-06-18/+17
| | | | | | | | | | | | | | | | There is an error in how the assembler version of the sc520 memory size reporting code works. As a result, it will only ever report at most the size of one bank of RAM Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Fix do_go_exec()Graeme Russ2010-05-06-4/+4
| | | | | | | | | | | | | | This was broken a long time ago by a49864593e083a5d0779fb9ca98e5a0f2053183d which munged the NIOS and x86 do_go_exec() Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Add register dump to crash handlersGraeme Russ2010-05-06-34/+180
| | | | | | | | | | | | | | | | Shamelessly steal the Linux x86 crash handling code and shove it into U-Boot (cool - it fits). Be sure to include suitable attribution to Linus Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Fix MMCR AccessGraeme Russ2010-05-06-95/+106
| | | | | | | | | | | | Change sc520 MMCR Access to use memory accessor functions Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: #ifdef out getenv_IPaddr()Graeme Russ2010-05-06-0/+2
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | x86: Add unaligned.hGraeme Russ2010-05-06-0/+1
| | | | | | | | Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
* | POST: Added ECC memory test for mpc83xx.Michael Zaidman2010-05-06-0/+196
| | | | | | | | | | | | | | Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com> Fixed minor coding style issue. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | cmd_onenand.c: moved to standard subcommand handlingFrans Meulenbroeks2010-05-05-115/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the fly also fixed the following things: - write help talked about a parameter oob, but that one was not used, so removed it from the help message. - the test command also allowed a force subcommand but didn't use it. eliminated the code. - do_onenand made static - do_onenand contained int blocksize; ... mtd = &onenand_mtd; this = mtd->priv; blocksize = (1 << this->erase_shift); As blocksize was not used the last two statements were unneeded so removed them. The first statement (mtd = ....) assigns to a global. Not sure if it is needed, and since I could not test this, left the line for now Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
* | ppc: unused memory region too close to current stack pointerNorbert van Bolhuis2010-05-05-2/+2
| | | | | | | | | | | | | | | | | | | | This avoids a possible overwrite of the (end of) ramdisk by u-boot. The unused memory region for ppc boot currently starts 1k below the do_bootm->bootm_start->arch_lmb_reserve stack ptr. This isn't enough since do_bootm->do_bootm_linux->boot_relocate_fdt calls printf which may very well use more than 1k stack space. Signed-off-by: Norbert van Bolhuis <nvbolhuis@aimvalley.nl>
* | allow print_size to print large numbers on 32-bit systemsTimur Tabi2010-05-05-15/+20
| | | | | | | | | | | | | | | | | | | | Modify print_size() so that it can accept numbers larger than 4GB on 32-bit systems. Add support for display terabyte, petabyte, and exabyte sizes. Change the output to use International Electrotechnical Commission binary prefix standard. Signed-off-by: Timur Tabi <timur@freescale.com>
* | fix print_size printing fractional gigabyte numbers on 32-bit platformsTimur Tabi2010-05-05-2/+2
|/ | | | | | | | | | In print_size(), the math that calculates the fractional remainder of a number used the same integer size as a physical address. However, the "10 *" factor of the algorithm means that a large number (e.g. 1.5GB) can overflow the integer if we're running on a 32-bit system. Therefore, we need to disassociate this function from the size of a physical address. Signed-off-by: Timur Tabi <timur@freescale.com>
* configs: remove unused CONFIG_COMMAND_HISTORYKim Phillips2010-05-04-3/+0
| | | | | | | | | | | | $ git grep CONFIG_COMMAND_HISTORY CHANGELOG: CONFIG_COMMAND_HISTORY include/configs/AP1000.h:#define CONFIG_COMMAND_HISTORY 1 include/configs/keymile-common.h:#define CONFIG_COMMAND_HISTORY 1 include/configs/manroland/common.h:#define CONFIG_COMMAND_HISTORY 1 $ Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Acked-by: Heiko Schocher <hs@denx.de>
* mvsmr: fix link errorAnatolij Gustschin2010-05-04-5/+5
| | | | | | | | | | | MVSMR board support doesn't link since recent rework of U-Boot directory structure. Fix it now. Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de> Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de> Fixed merge conflict Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2010-05-04-211/+2120
|\
| * Blackfin: bfin_mac: hook up new write_hwaddr functionMike Frysinger2010-05-03-15/+16
| | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * net: ethoc: add write_hwaddr supportThomas Chou2010-05-03-3/+3
| | | | | | | | | | Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * net: altera_tse: add write_hwaddr supportThomas Chou2010-05-03-28/+35
| | | | | | | | | | Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * net: fec_mxc: add write_hwaddr supportHeiko Schocher2010-05-03-1/+1
| | | | | | | | | | | | | | tested on the magnesium board. Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * net:kirkwood_egiga.c: MAC addresses programming using write_hwaddrPrafulla Wadaskar2010-05-03-0/+11
| | | | | | | | | | | | | | | | | | Added a new function kwgbe_write_hwaddr for programming egiga controller's hardware address. This function will be called for each egiga port being used Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * Program net device MAC addresses after initializingBen Warren2010-05-03-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new function to the eth_device struct for programming a network controller's hardware address. After all network devices have been initialized and the proper MAC address for each has been determined, make a device driver call to program the address into the device. Only device instances with valid unicast addresses will be programmed. Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Acked-by: Detlev Zundel <dzu@denx.de> Tested-by: Prafulla Wadaskar <prafulla@marvell.com> Tested-by: Heiko Schocher <hs@denx.de> Tested-by: Thomas Chou <thomas@wytron.com.tw>
| * net: add altera triple speeds ethernet mac driverThomas Chou2010-05-03-0/+1432
| | | | | | | | | | | | | | | | This driver supports the Altera triple speeds 10/100/1000 ethernet mac. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * net: add opencore 10/100 ethernet mac driverThomas Chou2010-05-03-0/+513
| | | | | | | | | | | | | | | | This patch ports the opencore 10/100 ethernet mac driver ethoc.c from linux kernel to u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>