From: Stefan Roese Date: Mon, 18 Sep 2006 08:48:03 +0000 (+0200) Subject: Merge with /home/stefan/git/u-boot/denx X-Git-Tag: U-Boot-1_2_0~26^2~11 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=64cd52efd1dc51a4a5a0cf10efe5362fab27de29;p=u-boot Merge with /home/stefan/git/u-boot/denx --- 64cd52efd1dc51a4a5a0cf10efe5362fab27de29 diff --cc CHANGELOG index f01ad9eaba,0f4b4d561e..e5fa93bc05 --- a/CHANGELOG +++ b/CHANGELOG @@@ -2,13 -2,152 +2,162 @@@ Changes since U-Boot 1.1.4: ====================================================================== ++* Remove compile warnings in fpga code ++ Patch by Stefan Roese, 18 Sep 2006 ++ +* Add initial support for the ALPR board from Prodrive + NAND needs some additional testing + Patch by Heiko Schocher, 15 Aug 2006 + +* Add FPGA Altera Cyclone 2 support + Patch by Heiko Schocher, 15 Aug 2006 + + * Disable autoboot abort for FO300 when silent mode is enabled + (according to S1 switch setting). + + * Cleanup examples binaries + + * Add support for AMCC Rainier PPX440GRx eval board + Patch by Stefan Roese, 13 Sep 2006 + + * Add NAND environment support for PPC440EPx Sequoia NAND boot config + Patch by Stefan Roese, 12 Sep 2006 + + * Update NAND boot documentation + Patch by Stefan Roese, 12 Sep 2006 + + * Fix alignment problem in "mtdparts" command + + * Add documentation on the latest build environment extensions to + the README file. + + * Remove dead code (i2o and dma) from cpu/mpc824x/drivers/ directory. + + * Fix LOG_DIR directory creation error. + Add support for automatic creation of BUILD_DIR directory. + + * Fix build problem cpu/ppc4xx/ndfc.c + Patch by Stefan Roese, 07 Sep 2006 + + * Fix build problem with CPCI440 + Patch by Stefan Roese, 07 Sep 2006 + + * Change Yellowstone to use CFI write buffer + Patch by Stefan Roese, 07 Sep 2006 + + * Add support for AMCC Sequoia PPC440EPx eval board + - Add support for PPC440EPx & PPC440GRx + - Add support for PPC440EP(x)/GR(x) NAND controller + in cpu/ppc4xx directory + - Add NAND boot functionality for Sequoia board, + please see doc/README.nand-boot-ppc440 for details + - This Sequoia NAND image doesn't support environment + in NAND for now. This will be added in a short while. + Patch by Stefan Roese, 07 Sep 2006 + + * Fix mkimage -l bug with multifile images on 64bit platforms + Patch by David Updegraff, 06 Sep 2006 + + * Fix build problems on sorcery board. + + * Fix coldfire build problems. + Patch by Marian Balakowicz, 01 Sep 2006 + + * Add support for a saving build objects in a separate directory. + Modifications are based on the Linux kernel approach and support + two use cases: + 1) Add O= to the make command line 'make O=/tmp/build all' + 2) Set environement variable BUILD_DIR to point to the desired location + 'export BUILD_DIR=/tmp/build' + 'make' + The second approach can also be used with a MAKEALL script + 'export BUILD_DIR=/tmp/build' + './MAKEALL' + Command line 'O=' setting overrides the BUILD_DIR environent variable. + When none of the above methods is used the local build is performed + and the object files are placed in the source directory. + + * Remove the board/netstar/crcit binary from git repository. + + * Fix tools/updater build error. + + * Fix tools/easylogo build error. + + * Fixed problems on PRS200 board caused by adding splash screen on MCC200 + + * Extended README entry on coding style + + * Added another example showing simple interrupt interception. + + * Added simple_strtoul(), getenv() and setenv() to the exported functions. + Also bumped up ABI version to reflect this change. + + * Added interrupt handling capabilities for mpc5xxx processors. + Also added Linux like BUG() macros. + + * Coding Style cleanup. + Patch by Stefano Babic, 31 Aug 2006 + + * Add splashscreen support for MCC200 board. + + * Make the serial driver framework work with CONFIG_SERIAL_MULTI + enabled + + * PCIe endpoint support for AMCC Yucca 440SPe board + Patch by Tirumala R Marri, 26 Aug 2006 + + * Improve DIMM detection for AMCC Yucca 440SPe board + Improved the memory DIMM detection for the Yucca 440SPe board for + the case where a memory DIMM is falsely detected as present. + This issue is seen on some AMCC Yucca 440SPe validation boards if + only one 512MB memory DIMM is installed, i.e. DIMM slot 0 is + populated and DIMM slot 1 is empty. In this case, U-Boot does + not correctly detect that there is only one DIMM memory module + installed and will falsely detect two DIMM memory modules are + present and therefore U-Boot will not calculate the correct amount + of total memory and u-boot will not booting up. + Patch by Adam Graham, 24 Aug 2006 + + * Fix typo. + + * Code cleanup + + * Update for MCC200 / PRS200 boards: + - auto-adjust console device for Linux. + - fix typos. + + * Add a fix for a buggy USB device on the FO300 board. + + * Updates for MCC200 / PRS200 boards: + - support for configurations with SDRAM or DDR memory, + - support for highboot and lowboot + - adjusting environment definitions + + * Add support for WTK FO300 board (TQM5200 based). + + * Fix TQM834x hang. + + * Update for SC520 board. + Patch by David Updegraff, 02 Dec 2005 + + * Fixed common.h spelling error. + Patch by Cory Tusar, 30 Nov 2005 + + * Fix typo. + Patch by Andreas Engel, 28 Nov 2005 + + * Fix fatload command on FAT32 formatted partitions. + Patch by Joachim Jaeger, 18 Nov 2005 + + * Fix drivers/dm9000.c when configured in 32 bit mode. + Patch by Eric Benard, 17 Nov 2005 + + * Cleanup debug code for yucca board. + + * MCC200: restrict addressable flash space to 32 MB + + * Add debug console on COM12 for MCC200 board + * Fix control-c handing in CONFIG_CMDLINE_EDITING Properly pass break code back from readline. Patch by Roger Blofeld, 31 Jul 2006 diff --cc MAINTAINERS index e1baa422ae,42627196f8..674fba78d0 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -279,6 -279,6 +279,7 @@@ Stefan Roese $@ ++# defines $(obj).depend target ++include $(SRCTREE)/rules.mk + - sinclude .depend ++sinclude $(obj).depend + +######################################################################### diff --cc common/altera.c index 357d70234c,ebd50382c6..06e8a95015 --- a/common/altera.c +++ b/common/altera.c @@@ -50,7 -50,7 +50,7 @@@ int altera_load( Altera_desc *desc, voi { int ret_val = FPGA_FAIL; /* assume a failure */ -- if (!altera_validate (desc, __FUNCTION__)) { ++ if (!altera_validate (desc, (char *)__FUNCTION__)) { printf ("%s: Invalid device descriptor\n", __FUNCTION__); } else { switch (desc->family) { @@@ -83,7 -78,7 +83,7 @@@ int altera_dump( Altera_desc *desc, voi { int ret_val = FPGA_FAIL; /* assume a failure */ -- if (!altera_validate (desc, __FUNCTION__)) { ++ if (!altera_validate (desc, (char *)__FUNCTION__)) { printf ("%s: Invalid device descriptor\n", __FUNCTION__); } else { switch (desc->family) { @@@ -111,7 -106,7 +111,7 @@@ int altera_info( Altera_desc *desc { int ret_val = FPGA_FAIL; -- if (altera_validate (desc, __FUNCTION__)) { ++ if (altera_validate (desc, (char *)__FUNCTION__)) { printf ("Family: \t"); switch (desc->family) { case Altera_ACEX1K: @@@ -187,7 -176,7 +187,7 @@@ int altera_reloc( Altera_desc *desc, ul { int ret_val = FPGA_FAIL; /* assume a failure */ -- if (!altera_validate (desc, __FUNCTION__)) { ++ if (!altera_validate (desc, (char *)__FUNCTION__)) { printf ("%s: Invalid device descriptor\n", __FUNCTION__); } else { switch (desc->family) { diff --cc common/fpga.c index 02d3e42b3b,02d3e42b3b..2eff239c47 --- a/common/fpga.c +++ b/common/fpga.c @@@ -139,7 -139,7 +139,7 @@@ static int fpga_dev_info( int devnum printf( "Xilinx Device\nDescriptor @ 0x%p\n", desc ); ret_val = xilinx_info( desc->devdesc ); #else -- fpga_no_sup( __FUNCTION__, "Xilinx devices" ); ++ fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); #endif break; case fpga_altera: @@@ -178,7 -178,7 +178,7 @@@ int fpga_reloc( fpga_type devtype, voi #if CONFIG_FPGA & CFG_FPGA_XILINX ret_val = xilinx_reloc( desc, reloc_off ); #else -- fpga_no_sup( __FUNCTION__, "Xilinx devices" ); ++ fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); #endif break; case fpga_altera: @@@ -271,7 -271,7 +271,7 @@@ int fpga_load( int devnum, void *buf, s #if CONFIG_FPGA & CFG_FPGA_XILINX ret_val = xilinx_load( desc->devdesc, buf, bsize ); #else -- fpga_no_sup( __FUNCTION__, "Xilinx devices" ); ++ fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); #endif break; case fpga_altera: @@@ -304,7 -304,7 +304,7 @@@ int fpga_dump( int devnum, void *buf, s #if CONFIG_FPGA & CFG_FPGA_XILINX ret_val = xilinx_dump( desc->devdesc, buf, bsize ); #else -- fpga_no_sup( __FUNCTION__, "Xilinx devices" ); ++ fpga_no_sup( (char *)__FUNCTION__, "Xilinx devices" ); #endif break; case fpga_altera: