summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-mipsWolfgang Denk2010-01-21-0/+26
|\
| * MIPS: qemu_mips: Import asm/unaligned.h from the Linux kernelShinya Kuribayashi2010-01-20-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with a few adjustments for U-Boot. This fixes the following build error: make -C lib_generic/ zlib.c:31:27: error: asm/unaligned.h: No such file or directory zlib.c: In function 'inflate_fast': zlib.c:641: warning: implicit declaration of function 'get_unaligned' make[1]: *** [zlib.o] Error 1 make[1]: Leaving directory `/home/skuribay/git/u-boot.git/lib_generic' make: *** [lib_generic/libgeneric.a] Error 2 Reported-by: Himanshu Chauhan <himanshu@symmetricore.com> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-nand-flashWolfgang Denk2010-01-21-7/+103
|\ \
| * | MX31: Activate NAND environment on i.MX31 PDK board.Magnus Lilja2010-01-19-4/+21
| | | | | | | | | | | | Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
| * | MXC: Add large page oob layout for i.MX31 NAND controller.Magnus Lilja2010-01-19-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import the large page oob layout from Linux mxc_nand.c driver. The CONFIG_SYS_NAND_LARGEPAGE option is used to activate the large page oob layout. Run time detection is not supported as this moment. This has been tested on the i.MX31 PDK board with a large page NAND device. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
| * | mxc_nand: Update driver to work with i.MX31.Magnus Lilja2010-01-19-3/+31
| | | | | | | | | | | | | | | | | | Tested on i.MX31 Litekit. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
| * | MX31: Add struct definition for clock control module in i.MX31.Magnus Lilja2010-01-19-0/+39
| |/ | | | | | | Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2010-01-21-12/+1083
|\ \ | |/ |/|
| * Blackfin: add support for kgdbRobin Getz2010-01-17-12/+982
| | | | | | | | | | Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * asm-generic/signal.h: import from linuxRobin Getz2010-01-17-0/+101
| | | | | | | | | | | | | | | | We need signal.h for Blackfin/KGDB, so import the asm-generic/signal.h for people to leverage. Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | microblaze: zlib needs asm/unaligned.hMichal Simek2010-01-19-0/+16
| | | | | | | | | | | | | | Microblaze has own hw unaligned handler if is available. Use big endian version. Signed-off-by: Michal Simek <monstr@monstr.eu>
* | microblaze: Remove getenv_IPaddr prototypeMichal Simek2010-01-19-1/+0
| | | | | | | | | | | | | | Commit 6a45e384955262882375a2785426dc65aeb636c4 should remove reference from Microblaze too. Signed-off-by: Michal Simek <monstr@monstr.eu>
* | MAINTAINERS: fix nhk8815 board nameAlessandro Rubini2010-01-19-1/+1
| | | | | | | | Signed-off-by: Alessandro Rubini <rubini@unipv.it>
* | Fix breakage in SMC EEPROM standalone applicationsBen Warren2010-01-19-10/+0
| | | | | | | | | | | | | | | | | | | | Commit 6a45e384955262882375a2785426dc65aeb636c4 (Make getenv_IPaddr() global) inadvertently added ' #include "net.h" ' to the standalone programs, creating duplicate definitions of 'struct eth_device'. This patch removes the local definitions and removes other code that breaks due to the change in definition. Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Makefile: fix parallel buildDaniel Hobi2010-01-18-1/+4
|/ | | | | | | | | | | | | | | | | | | | | During parallel build, the top Makefile spawns multiple sub-makes for targets in cpu/$(CPU) and $(dir $(LDSCRIPT)). If the .depend files are not present in these directories, the sub-makes may end up generating these files simultaneously which leads to corrupted content. A typical error message is: .depend:39: *** multiple target patterns. Stop. This patch serializes the creation of .depend in cpu/$(CPU) and $(dir $(LDSCRIPT)) by adding these directories to the depend target in the top Makefile. Other directories in $(LIBS) are not affected since they contain only one Make target and thus only one sub-make is spawned per directory. Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* CRAMFS: support cramfs in RAMHeiko Schocher2010-01-18-0/+217
| | | | | | | | | | | | | cramfsls and cramfsload are added to the command list. A cramfs placed at 'cramfs_addr' can the be listed with 'cramfsls' and files can be loaded with 'cramfsload'. 'cramfs_addr' is an environment variable specifying the address the cramfs is located. This works for powerpc and for ARM. Use CONFIG_CMD_CRAMFS. Signed-off-by: Andreas Huber <andreas.huber@keymile.com> Signed-off-by: Heiko Schocher <hs@denx.de>
* powerpc: keymile boards updatesHeiko Schocher2010-01-18-149/+22
| | | | | | | | | | | | | | | | | | | | - malloc size 4 MB for all keymile boards - use generic FDT code for fixing up the DTS - enable unit-led at startup for keymile boards - remove some dts updates for keymile boards - ppc_83xx, kmeter1: take FE/GbE PHYs out of reset - ppc_83xx, kmeter1: change from Intel Strata to Spansion 64MB flash changed from Intel Strata to Spansion 64MB flash and changed flash layout. +---------+----------+-----------------------+-----------------------------+ | name | size | range | description | +---------+----------+-----------------------+-----------------------------+ | u-boot | 768 KB | 0xf0000000-0xf00bffff | for u-boot | | env | 128 KB | 0xf00c0000-0xf00dffff | for environment | | envred | 128 KB | 0xf00e0000-0xf00fffff | for environment (redundant) | | ubi0 | 64512 KB | 0xf0100000-0xf3ffffff | ubi0 for ubi volumes | +---------+----------+-----------------------+-----------------------------+ Signed-off-by: Heiko Schocher <hs@denx.de>
* env, eeprom: add redundant environment supportHeiko Schocher2010-01-18-4/+127
| | | | | | | | Add redundant environment support for environment lying on a EEPROM. Tested on uppcoming suen3 support Signed-off-by: Andreas Huber <andreas.huber@keymile.com>
* cmd_eeprom: I2C updatesHeiko Schocher2010-01-18-11/+84
| | | | | | | | | | | | | - CONFIG_ENV_EEPROM_IS_ON_I2C define this, if you have I2C and SPI activated, and your EEPROM, which holds the environment, is on the I2C bus. - CONFIG_I2C_ENV_EEPROM_BUS if you have an Environment on an EEPROM reached over I2C muxes, you can now define, how to reach this EEPROM. Signed-off-by: Heiko Schocher <hs@denx.de>
* move definition of macros likely and unlikely to compiler.hMatthias Kaehlcke2010-01-18-3/+3
| | | | | | | the macros likely and unlikely were defined in include/linux/mtd/compat.h, but used in code not related to MTD. moved the macro definitions to compiler.h Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
* cmd_bootm.c: Change interpretation of standalone image parameters.Detlev Zundel2010-01-18-3/+0
| | | | | | | | | | Current code uses the second argument to bootm for standalone images to override the load address specified in the image instead of passing all parameters as is to the application. This behaviour is not documented and not in line with how the go command works for standalone applications, so we simply drop it. Signed-off-by: Detlev Zundel <dzu@denx.de>
* cmd_bootm.c: Do not load a ramdisk when not booting a kernel.Detlev Zundel2010-01-18-1/+2
| | | | | | | In case we boot an image marked as 'standalone' and 'linux', the current code erroneously tried to load a ramdisk. Signed-off-by: Detlev Zundel <dzu@denx.de>
* kgdb: update mem2hex/hex2mem funcsRobin Getz2010-01-18-11/+32
| | | | | | | | | | Convert the funcs to do the conversion inline so that we can do the copy all at once with memcpy. This let's us push out an weird arch-specific issue with accessing different regions of memory to the memcpy function like the MMRs on Blackfin systems, and it should be a bit faster. Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* kgdb: drop duplicate debugger_exception_handlerMike Frysinger2010-01-18-36/+0
| | | | | | | The debugger_exception_handler definition is the same for everyone, so use the common one now. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* kgdb: add default generic stubsRobin Getz2010-01-18-1/+65
| | | | | | | | | The default kgdb functions can be implemented with common U-Boot functions, so rather than force everyone to copy & paste these things, create a set of weak stubs. Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* netconsole: mark local funcs with staticMike Frysinger2010-01-18-5/+5
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* easylogo: add support for 16-bit RGB565Michael Hennerich2010-01-18-18/+60
| | | | | Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* mpc5xxx/cpu_init.c: Convert to IO accessors.Detlev Zundel2010-01-18-48/+78
| | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* mpc5xxx.h: Add structure definition for XLB arbiter block.Detlev Zundel2010-01-18-0/+17
| | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* config_defaults.h: new header for common u-boot config defaultsMike Frysinger2010-01-18-8/+23
| | | | | | | | There are a bunch of features in U-Boot that we want to enable by default, and it's best if we centralize them in one place rather than updating all the board files out there. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2010-01-17-1198/+3161
|\
| * Blackfin: drop .eh_frame from linker scriptMike Frysinger2010-01-17-1/+0
| | | | | | | | | | | | | | Nothing in U-Boot uses runtime C++ exceptions/unwinding, so there is no need to list this section. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: use sort funcs in the linker scriptMike Frysinger2010-01-17-2/+1
| | | | | | | | | | | | This is just Blackfin catching up with every one else. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: tcm-bf518: new board portHarald Krapfenbauer2010-01-17-1/+298
| | | | | | | | | | Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: enable JFFS summary support for ADI boardsMike Frysinger2010-01-17-0/+3
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf518f-ezbrd: increase monitor lengthMike Frysinger2010-01-17-1/+1
| | | | | | | | | | | | The addition of KGDB overflowed the current linker section. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: handle anomaly 05000257Robin Getz2010-01-17-1/+10
| | | | | | | | | | | | | | Need to reload the loop counters to keep from corrupting hardware loops. Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: keep hwtrace on CPLB missRobin Getz2010-01-17-0/+9
| | | | | | | | | | | | | | | | | | Crashes rarely happen in the CPLB miss handler compared to the rest of U-Boot code, so disable hardware tracing when processing misses. This way a crash due to other functions will be shown properly. Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: add a netconsole helperRobin Getz2010-01-17-0/+12
| | | | | | | | | | Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: add support for BF527-EZKIT v2.1Michael Hennerich2010-01-17-14/+1391
| | | | | | | | | | | | | | The new board revision has a different LCD. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf527-ezkit/bf548-ezkit: add musb board specific initializationCliff Cai2010-01-17-0/+29
| | | | | | | | | | Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bfin_spi: round up clock dividerCliff Cai2010-01-17-1/+6
| | | | | | | | | | | | | | | | If the requested clock cannot be exactly obtained, round it up so that we err on the side of slightly slower rather than slightly faster. Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: pull io funcs from linuxMike Frysinger2010-01-17-43/+298
| | | | | | | | | | | | | | Some common code uses more of the io.h funcs than we currently provide, so pull in all of the ones from the linux kernel. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: section off the CF/IDE io.h hacksMike Frysinger2010-01-17-12/+15
| | | | | | | | | | | | | | These need to be rethought, but until that happens, isolate the hack so that we can extend the common code without breaking things. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: drop unused funcs from io.hMike Frysinger2010-01-17-38/+0
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf533-stamp: split and cleanup CF/IDE codeMike Frysinger2010-01-17-110/+94
| | | | | | | | | | | | | | Give the CF/IDE code its own file to keep things cleanly separated. While we're here, clean up the code to use common functions. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: convert bfin_sdh to generic mmcCliff Cai2010-01-17-459/+161
| | | | | | | | | | Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bfin_spi: let boards control idle valueCliff Cai2010-01-17-1/+5
| | | | | | | | | | | | | | Some SPI devices like to see high idle values rather than low. Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: asm/string.h: drop useless includesMike Frysinger2010-01-17-4/+1
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: use new bfin read/write mmr helper funcsMike Frysinger2010-01-17-80/+91
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>