summaryrefslogtreecommitdiff
path: root/common
Commit message (Collapse)AuthorAgeLines
* Merge branch 'origin' into kconfig-for-1.3.1Grant Likely2007-11-20-4/+7
|\
| * Fix compiler warnings for PPC systems. Update CHANGELOG.Wolfgang Denk2007-11-18-1/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Fix warning differ in signedness in common/cmd_scsi.cStefan Roese2007-11-18-3/+6
| | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'origin' into kconfig-for-1.3.1Grant Likely2007-11-16-140/+170
|\ \ | |/ | | | | | | | | Conflicts: drivers/Makefile
| * Fixed mips_io_port_base build errors.Jean-Christophe PLAGNIOL-VILLARD2007-11-17-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch has been sent on: - 29 Sep 2007 Although mips_io_port_base is currently a part of IDE command, it is quite fundamental for MIPS I/O port access such as in[bwl] and out[bwl]. So move it to MIPS general part, and introduce `set_io_port_base()' from Linux. This patch is triggered by multiple definition of `mips_io_port_base' build error on gth2 (and tb0229 also needs this fix.) board/gth2/libgth2.a(gth2.o): In function `log_serial_char': /home/skuribay/devel/u-boot.git/board/gth2/gth2.c:47: multiple definition of `mips_io_port_base' common/libcommon.a(cmd_ide.o):/home/skuribay/devel/u-boot.git/common/cmd_ide.c:712: first defined here make: *** [u-boot] Error 1 Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * Fix a bug in the slave serial programming mode for the XilinxWolfgang Denk2007-11-17-2/+2
| | | | | | | | | | | | | | | | | | | | Spartan2/3 FPGAs. The old code used "< 0" on a "char" type to test if the most significant bit was set, which did not work on any architecture where "char" defaulted to be an unsigned type. Based on a patch by Angelos Manousaridis <amanous@inaccessnetworks.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge branch 'master' of /home/wd/git/u-boot/workWolfgang Denk2007-11-17-6/+6
| |\
| | * Fix warning differ in signedness in common/cmd_ide.cJean-Christophe PLAGNIOL-VILLARD2007-11-16-6/+6
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | NET: Add Ethernet 1000BASE-X support for PPC4xxLarry Johnson2007-11-06-60/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for 1000BASE-X to functions "miiphy_speed ()" and "miiphy_duplex()". It also adds function "miiphy_is_1000base_x ()", which returns non-zero iff the PHY registers are configured for 1000BASE-X. The "mii info" command is modified to distinguish between 1000BASE-T and -X. Signed-off-by: Larry Johnson <lrj@acm.org> Signed-off-by: Ben Warren <bwarren@qstreams.com>
| * | NET: Cosmetic changesLarry Johnson2007-11-06-73/+68
| |/ | | | | | | | | Signed-off-by: Larry Johnson <lrj@acm.org> Signed-off-by: Ben Warren <bwarren@qstreams.com>
* | Build: split COBJS value into multiple linesGrant Likely2007-11-15-25/+98
|/ | | | | | | | | This change is in preparation for condtitionial compile support in the build system. By spliting them all into seperate lines now, subsequent patches that change 'COBJS-y += ' into 'COBJS-$(CONFIG_<blah>) += ' will be less invasive and easier to review Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* Fix the issue of usb_kbd driver missing the scan code of key 'z'.Zhang Wei2007-11-03-1/+1
| | | | | | | | | The scan code of the key 'z' is 0x1d, which should be handled. The change has be tested on NOVATEK USB keyboard and ULI PCI OHCI controller. Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
* Fix two typos.Detlev Zundel2007-10-19-2/+2
| | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* Merge branch 'merge' of git://www.denx.de/git/u-boot-microblazeWolfgang Denk2007-10-13-8/+8
|\
| * [FIX] repair MFSL commandsMichal Simek2007-09-24-8/+8
| |
| * synchronizition with mainlineMichal Simek2007-09-24-33/+14
| |
| * Merge ../u-bootMichal Simek2007-09-24-13/+6
| |\
| * \ Merge git://www.denx.de/git/u-bootMichal Simek2007-09-11-92/+177
| |\ \
| * \ \ Merge git://www.denx.de/git/u-boot into mergeMichal Simek2007-08-15-447/+536
| |\ \ \
| * \ \ \ Merge git://www.denx.de/git/u-bootMichal Simek2007-08-07-246/+250
| |\ \ \ \
| * | | | | [FIX] Coding style cleanup - Wolfgang's suggestionsMichal Simek2007-08-06-8/+8
| | | | | |
| * | | | | Merge git://www.denx.de/git/u-bootMichal Simek2007-08-05-150/+110
| |\ \ \ \ \
| * | | | | | [FS] Added support for ROMFSMichal Simek2007-07-14-17/+35
| | | | | | |
| * | | | | | [FIX] correct help for rsprMichal Simek2007-07-13-5/+6
| | | | | | |
* | | | | | | Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flashWolfgang Denk2007-10-13-4/+297
|\ \ \ \ \ \ \
| * | | | | | | OneNAND support (take #2)Kyungmin Park2007-09-17-4/+297
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [PATCH 3/3] OneNAND support (take #2) OneNAND support at U-Boot Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
* | | | | | | Fpga: fix incorrect test of CFG_FPGA_XILINX macroGrant Likely2007-09-26-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CFG_FPGA_XILINX is a bit value used to test against the value in CONFIG_FPGA. Testing for a value will always return TRUE. I don't think that is the intention in this code. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | | | TQM8xx[LM]: Fix broken environment alignment.Wolfgang Denk2007-09-16-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With recent toolchains, the environment sectors were no longer aligned to sector boundaries. The reason was a combination of two bugs: 1) common/environment.c assumed that CONFIG_TQM8xxL would be defined for all TQM8xxL and TQM8xxM boards. But "include/common.h", where this gets defined, is not included here (and cannot be included without causing lots of problems). Added a new #define CFG_USE_PPCENV for all boards which really want to put the environment is a ".ppcenv" section. 2) The linker scripts just include environment.o, silently assuming that the objects in that file are really in the order in which they are coded in the C file, i. e. "environment" first, then "redundand_environment", and "env_size" last. However, current toolchains (GCC-4.x) reorder the objects, causing the environment data not to start on a flash sector boundary: Instead of: we got: 40008000 T environment 40008000 T env_size 4000c000 T redundand_environment 40008004 T redundand_environment 40010000 T env_size 4000c004 T environment Note: this patch fixes just the first part, and cures the alignment problem by making sure that "env_size" gets placed correctly. However, we still have a potential issue because primary and redundant environment sectors are actually swapped, i. e. we have now: 40008000 T redundand_environment 4000c000 T environment 40010000 T env_size This shall be fixed in the next version. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | | | | Fix do_div() usage in nand process outputMatthias Fuchs2007-09-15-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix usage of do_div() in nand erase|read|write process output. The last patch to nand_util.c introduced do_div() instead of libgcc's implementation. But do_div() returns the quotient in its first macro parameter and not as result. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | | | | NAND: Add CFG_NAND_QUIET optionMatthias Fuchs2007-09-15-0/+4
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This config option sets the default for the progress information output behavior that can also be configured through the 'quiet' environment variable. The legacy NAND code does not print the current progress info on the console. So this option is for backward compatibility for units that are in the field and where setting the quiet variable is not an option. With CFG_NAND_QUIET set to '1' the console progress info is turned off. This can still be overwritten through the environment variable. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | | | Bugfix: make bootm+libfdt compile on boards with no flashGrant Likely2007-09-09-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | | PXA270: Add support for multiple serial ports.stefano babic2007-09-07-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for multiple serial ports to the PXA target. FFUART, BTUART and STUART are supported. Signed-off-by: Stefano Babic <sbabic@denx.de>
* | | | | Fix do_bootm_linux() so that multi-file images with FDT blob boot.Bartlomiej Sieka2007-09-07-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect blob address calculation in do_bootm_linux() that prevents booting the kernel from a multi-file image (kernel + initrd + blob). Also, make minor updates to the U-Boot's output and to the coding style. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
* | | | | bootm/fdt: Only process the fdt if an fdt address was providedGrant Likely2007-09-06-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Boards with CONFIG_OF_LIBFDT enabled are not able to boot old-style kernels using the board info structure (instead of passing a device tree) This change allows the old style booting to be used if the fdt argument was not passed to 'bootm'. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* | | | | Fix compilation error for omap2420h4_config.Dirk Behme2007-08-29-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omap2420h4 switched to cfi, so remove old (already disabled) flash.c and flash_probe() calls in env_flash.c. Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
* | | | | IDE: - make ide_inb () and ide_outb () "weak", so boards canHeiko Schocher2007-08-28-35/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | define there own I/O functions. (Needed for the pcs440ep board). - The default I/O Functions are again 8 Bit accesses. - Added CONFIG_CMD_IDE for the pcs440ep Board. Signed-off-by: Heiko Schocher <hs@denx.de>
* | | | | ColdFire: Fix some remaining problems with CFG_CMD_Stefan Roese2007-08-18-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | | | | ColdFire: Add M54455EVB for MCF5445xTsiChungLiew2007-08-16-5/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
* | | | | ColdFire: MCF5329 Update and cleanupTsiChungLiew2007-08-16-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
* | | | | Merge branch 'denx-coldfire' into coldfire-aug2007John Rigby2007-08-16-1/+54
|\ \ \ \ \
| * \ \ \ \ Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-08-15-693/+785
| |\ \ \ \ \
| * \ \ \ \ \ Merge with /home/stefan/git/u-boot/u-boot-coldfire-freescaleStefan Roese2007-07-16-1/+54
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch 'master' into u-boot-5329-earlyJohn Rigby2007-07-10-93/+906
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Added M5329AFEE and M5329BFEE PlatformsTsiChung Liew2007-06-18-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added board/freescale/m5329evb, cpu/mcf532x, drivers/net, drivers/serial, immap_5329.h, m5329.h, mcfrtc.h, include/configs/M5329EVB.h, lib_m68k/interrupts.c, and rtc/mcfrtc.c Modified CREDITS, MAKEFILE, Makefile, README, common/cmd_bdinfo.c, common/cmd_mii.c, include/asm-m68k/byteorder.h, include/asm-m68k/fec.h, include/asm-m68k/io.h, include/asm-m68k/mcftimer.h, include/asm-m68k/mcfuart.h, include/asm-m68k/ptrace.h, include/asm-m68k/u-boot.h, lib_m68k/Makefile, lib_m68k/board.c, lib_m68k/time.c, net/eth.c and rtc/Makefile Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
* | | | | | | fdt: suppress unused variable 'bd' warningKim Phillips2007-08-16-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | | | | | | Fix warnings from of_data copy fixAndy Fleming2007-08-16-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to cast of_flat_tree to ulong. Signed-off-by: Andy Fleming <afleming@freescale.com>
* | | | | | | Fix of_data copying for CONFIG_OF_FLAT_TREE-using boardsAndy Fleming2007-08-16-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed" neglected to *also* put the code inside the similar #ifdef for CONFIG_OF_FLAT_TREE. Signed-off-by: Andy Fleming <afleming@freescale.com>
* | | | | | | Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-08-15-166/+163
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix where the #ifdef CFG_BOOTMAPSZ is placed.Jerry Van Baren2007-08-15-2/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 073e1b509980cefe6f53c2d7fbbcd135df1e3924 "Fix initrd/dtb interaction" put the new code outside of the #if defined(CONFIG_OF_LIBFDT) when it should have gone inside of the conditional. As a result, it broke non-LIBFDT board builds. Also added a missing "not." to the comment. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
* | | | | | Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-08-15-635/+766
|\ \ \ \ \ \ | |/ / / / /