summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'fixes' into cleanupsHaavard Skinnemoen2008-12-17-77714/+116712
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: board/atmel/atngw100/atngw100.c board/atmel/atstk1000/atstk1000.c cpu/at32ap/at32ap700x/gpio.c include/asm-avr32/arch-at32ap700x/clk.h include/configs/atngw100.h include/configs/atstk1002.h include/configs/atstk1003.h include/configs/atstk1004.h include/configs/atstk1006.h include/configs/favr-32-ezkit.h include/configs/hammerhead.h include/configs/mimc200.h
| * avr32: Remove second definition of virt_to_phys()Haavard Skinnemoen2008-12-17-7/+2
| | | | | | | | | | | | | | | | | | | | The second definition introduced by 65e43a1063 conflicts with the existing one. Also, convert the existing definition to use phys_addr_t. The volatile qualifier is still needed due to brain damage elsewhere. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| * Prepare 2009.01-rc1v2009.01-rc1Wolfgang Denk2008-12-16-3/+105
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * include/configs/at91cap9adk.h: fix typo.Wolfgang Denk2008-12-16-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * board/trab/memory.c: Fix compile problems.Wolfgang Denk2008-12-16-3/+3
| | | | | | | | | | | | | | | | | | | | | | Apply changes from commit 44b4dbed to board/trab/memory.c, too. Actually we'd need a major cleanup here - as it turns out, board/trab/memory.c is more or less a verbatim copy of post/drivers/memory.c ... but then, trab is EOL anyway,r so this is not worth the effort. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/masterWolfgang Denk2008-12-16-327/+3006
| |\
| | * jffs2: include <linux/mtd/compat.h> instead of defining own min_tIlya Yanok2008-12-16-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include <linux/mtd/compat.h> header for min_t definition instead of providing our own one. Removes warnings in case of OneNAND support enabled. Although I thinks it's a bit silly to include <linux/mtd/compat.h> just for min_t... Signed-off-by: Ilya Yanok <yanok@emcraft.com> Acked-by: Stefan Roese <sr@denx.de>
| | * powerpc: fix io.h build warning with CONFIG_PHYS_64BITBecky Bruce2008-12-16-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Casting a pointer to a phys_addr_t when it's an unsigned long long on a 32-bit system without first casting to a non-pointer type generates a compiler warning. Fix this. Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
| | * post/Makefile: fix dependency problem with parallel buildsWolfgang Denk2008-12-16-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parallel builds (using "make -jN") would occasionally fail with error messages like ppc_4xxFP-objdump: string.o: File format not recognized or post/libpost.a(cpu.o): In function `cpu_post_test': /home/wd/git/u-boot/work/post/lib_ppc/cpu.c:130: undefined reference to `cpu_post_test_string' or similar. We now make sure to run the 'postdeps" step before attempting to build the specific POST libraries. Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Makefile: fix dependency problem with parallel buildsWolfgang Denk2008-12-16-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parallel builds (using "make -jN") would occasionally fail with error messages like include/autoconf.mk:212: *** missing separator. Stop. Line numbers and affected boards were changing. Obviously some Makefiles included autoconf.mk while it was still being written to. As a fix, we now write to a temporary file first and then rename it, so that it is really ready to use as soon as it appears. Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Coding style cleanup, update CHANGELOG.Wolfgang Denk2008-12-16-22/+2684
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * spi/stmicro: fix debug() display of cmdMike Frysinger2008-12-16-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The stmicro_wait_ready() func tries to show the actual opcode that was sent to the device, but instead it displays the array pointer. Fix it to pull out the opcode from the start of the array. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| | * env_sf: support embedded environmentsMike Frysinger2008-12-16-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE are defined, and the sect size is larger than the env size, then it means the env is embedded in a block. So we have to save/restore the part of the sector which is not the environment. Previously, saving the environment in SPI flash in this setup would probably brick the board as the rest of the sector tends to contain actual U-Boot data/code. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
| | * i2c: merge all i2c_reg_read() and i2c_reg_write() into inline functionsTimur Tabi2008-12-15-231/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All implementations of the functions i2c_reg_read() and i2c_reg_write() are identical. We can save space and simplify the code by converting these functions into inlines and putting them in i2c.h. Signed-off-by: Timur Tabi <timur@freescale.com> Acked-By: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * lib_ppc: rework the flush_cacheDave Liu2008-12-15-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It is possible to miss flush/invalidate the last cache line, we fix it at here. - add the volatile and memory clobber. They are pointed by Scott Wood. Signed-off-by: Dave Liu <daveliu@freescale.com>
| | * Introduce addr_map libraryKumar Gala2008-12-15-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a library that helps in translating between virtual and physical addresses. This library can be useful as a simple means to implement map_physmem() and virt_to_phys() for platforms that need functionality beyond the simple 1:1 mapping. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * Introduce virt_to_phys()Kumar Gala2008-12-15-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | virt_to_phys() returns the physical address given a virtual. In most cases this will be just the input value as the vast majority of systems run in a 1:1 mode. However in systems that are not running this way it should report the physical address or ~0 if no mapping exists for the given virtual address. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * POST Make: fix the sub-dir dependencies missing.Yuri Tikhonov2008-12-15-1/+6
| | | | | | | | | | | | Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| | * Fix a typo in fw_env.configMartin Michlmayr2008-12-15-1/+1
| | | | | | | | | | | | | | | Reported-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Remove unused CONFIG_ADDR_STREAMING definesPeter Tyser2008-12-14-20/+0
| | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| | * cmd_mem: Remove unused variablePeter Tyser2008-12-14-1/+0
| | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| | * Fix new found CFG_Jean-Christophe PLAGNIOL-VILLARD2008-12-14-14/+14
| | | | | | | | | | | | | | | | | | | | | Also fix some minor typos. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Remove compiler warning: target CPU does not support interworkingSergei Poselenov2008-12-13-0/+10
| | | | | | | | | | | | | | | | | | | | | This warning is issued by modern ARM-EABI GCC on non-thumb targets. Signed-off-by: Vladimir Panfilov <pvr@emcraft.com> Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
| | * Fix FIT and FDT support to have CONFIG_OF_LIBFDT and CONFIG_FIT independentJean-Christophe PLAGNIOL-VILLARD2008-12-13-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FDT support is used for both FIT style images and for architectures that can pass a fdt blob to an OS (ppc, m68k, sparc). For other architectures and boards which do not pass a fdt blob to an OS but want to use the new uImage format, we just need FIT support. Now we can have the 4 following configurations : 1) FIT only CONFIG_FIT 2) fdt blob only CONFIG_OF_LIBFDT 3) both CONFIG_OF_LIBFDT & CONFIG_FIT 4) none none Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | trab: make trab_fkt standalone code independent of libgccWolfgang Denk2008-12-16-1/+8
| |/ | | | | | | | | | | Use our own local functions in lib_arm/ instead. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2008-12-13-21/+25
| |\
| | * ppc4xx: Disable EEPROM write access on PMC440 boardsMatthias Fuchs2008-12-10-1/+1
| | | | | | | | | | | | | | | | | | This patch disables EEPROM wrtie access by default on PMC440 board. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
| | * ppc4xx: Fix Ethernet PHY LED configuration on PMC440 boardsMatthias Fuchs2008-12-10-4/+18
| | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
| | * ppc4xx: Update TEXT_BASE for CPCI405 boardsMatthias Fuchs2008-12-10-12/+5
| | | | | | | | | | | | | | | | | | | | | This patch fixes building U-Boot for CPCI405 boards. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| | * ppc4xx: Remove some features from ALPR to fit into 256k againStefan Roese2008-12-10-4/+1
| | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | Merge branch 'master' of git://git.denx.de/u-boot-mipsWolfgang Denk2008-12-13-12/+45
| |\ \
| | * | MIPS: Flush data cache upon relocationStefan Roese2008-12-10-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch now adds a flush to the data cache upon relocation. The current implementation is missing this. Only a comment states that it should be done. So let's really do it now. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| | * | MIPS: Add CONFIG_SKIP_LOWLEVEL_INITStefan Roese2008-12-10-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the CONFIG_SKIP_LOWLEVEL_INIT option to start.S. This enables support for boards where the lowlevel initialization is already done when U-Boot runs (e.g. via OnChip ROM). This will be used in the upcoming VCTH board support. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| | * | MIPS: Add board_early_init_f() to init_sequenceStefan Roese2008-12-10-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the board_early_init_f() call to the MIPS init sequence. A weak dummy implementation is also added which can be overridden by a board specific version. This will be used by the upcoming VCTH board support. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| | * | MIPS: Add onenand_init() to board.c and move nand_init()Stefan Roese2008-12-10-5/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a call to onenand_init() for OneNAND support and moves the nand_init() call to an earlier place, so that the environment can be used from NAND and OneNAND. Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2008-12-13-270/+138
| |\ \
| | * | sh: Update sh2/sh2a timerNobuhiro Iwamatsu2008-12-10-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renesas SH2/SH2A timer broken. This patch fix timer function. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | sh: r2dplus fix register accessJean-Christophe PLAGNIOL-VILLARD2008-12-10-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | sh: r2dplus/lowlevel_init: coding style fixJean-Christophe PLAGNIOL-VILLARD2008-12-10-21/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | sh: Changed value of CACHE_OC_NUM_ENTRIES and CACHE_OC_WAY_SHIFTNobuhiro Iwamatsu2008-12-10-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SH4 is different a value of CACHE_OC_NUM_ENTRIES and CACHE_OC_WAY_SHIFT every CPU. This patch corrects these values. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | sh: Update sh timer functionNobuhiro Iwamatsu2008-12-10-222/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to write/readX function and fix timer problem. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | sh: Migo-R: Update BSC valueNobuhiro Iwamatsu2008-12-10-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A value of BSC CS4 was wrong, Fixed it. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | sh: Update ms7722se board configNobuhiro Iwamatsu2008-12-10-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | sh: Update SuperH serial driverNobuhiro Iwamatsu2008-12-10-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The address of SCFSR register is wrong at SH7720/SH7721. This patch fix this. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| | * | sh: fix rsk7203 and MigoR out of tree buildJean-Christophe PLAGNIOL-VILLARD2008-12-10-2/+2
| | |/ | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | Merge branch 'master' of git://git.denx.de/u-boot-microblazeWolfgang Denk2008-12-13-499/+11
| |\ \
| | * | microblaze: Remove XUPV2P boardMichal Simek2008-12-10-490/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- Microblaze platforms use generic settings and to have many platforms is confusing that's why I decided to remove this platform from U-BOOT. ml401 tree is sufficient for covering all Microblaze platforms. This change will go through microblaze custodian tree.
| | * | microblaze: Remove CONFIG_LIBFDT due to error in common filesMichal Simek2008-12-10-2/+0
| | | |
| | * | microblaze: Fix ml401 uart16550 settingMichal Simek2008-12-10-7/+10
| | | | | | | | | | | | | | | | Signed-off-by: Michal Simek <monstr@monstr.eu>
| | * | microblaze: Set up relocation is doneMichal Simek2008-12-10-0/+1
| | | |