author | Stefan Roese <sr@denx.de> | |
Mon, 18 Sep 2006 08:48:03 +0000 (10:48 +0200) | ||
committer | Stefan Roese <sr@denx.de> | |
Mon, 18 Sep 2006 08:48:03 +0000 (10:48 +0200) |
1 | 2 | |||
---|---|---|---|---|
CHANGELOG | patch | | diff1 | | diff2 | | blob | history |
MAINTAINERS | patch | | diff1 | | diff2 | | blob | history |
MAKEALL | patch | | diff1 | | diff2 | | blob | history |
Makefile | patch | | diff1 | | diff2 | | blob | history |
board/prodrive/alpr/Makefile | patch | | diff1 | | | | blob | history |
common/Makefile | patch | | diff1 | | diff2 | | blob | history |
common/altera.c | patch | | diff1 | | diff2 | | blob | history |
common/fpga.c | patch | | diff1 | | diff2 | | blob | history |
cpu/ppc4xx/405gp_pci.c | patch | | diff1 | | diff2 | | blob | history |
include/ppc440.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc CHANGELOG
index f01ad9eabaa2efc4be19102e0519a80eeacc87ee,0f4b4d561e9d9e7172128ed29a97d2e5eea4067c..e5fa93bc052472efeef54f5c64d0318981184838
+++ b/CHANGELOG
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 e1baa422ae74a2e2182bc92fd5187169713e8a68,42627196f8653f5389d7229e2ef60bae09690266..674fba78d0526967832af39999e9d8572281537e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
TQM85xx MPC8540/8541/8555/8560
++ alpr PPC440GX
bamboo PPC440EP
bunbinga PPC405EP
ebony PPC440GP
diff --cc MAKEALL
index 467a9bee0a7a893fb7de1891d0a28c43a92eb320,2a334ffbf93134a9ad53dbd27f49fc8344643002..3d5449e75c5635b45140e0d84d497cfaf02f0076
+++ b/MAKEALL
#########################################################################
LIST_4xx=" \
-- ADCIOP AP1000 AR405 ASH405 \
- bubinga CANBT CMS700 CPCI2DP \
- CPCI405 CPCI4052 CPCI405AB CPCI405DT \
- CPCI440 CPCIISER4 CRAYL1 csb272 \
- csb472 DASA_SIM DP405 DU405 \
- ebony ERIC EXBITGEN G2000 \
- HH405 HUB405 JSE KAREF \
- luan METROBOX MIP405 MIP405T \
- ML2 ml300 ocotea OCRTC \
- ORSG p3p440 PCI405 pcs440ep \
- PIP405 PLU405 PMC405 PPChameleonEVB \
- sbc405 VOH405 VOM405 W7OLMC \
- bamboo bubinga CANBT CMS700 \
- CPCI2DP CPCI405 CPCI4052 CPCI405AB \
- CPCI405DT CPCI440 CPCIISER4 CRAYL1 \
- csb272 csb472 DASA_SIM DP405 \
- DU405 ebony ERIC EXBITGEN \
- G2000 HH405 HUB405 JSE \
- KAREF luan METROBOX MIP405 \
- MIP405T ML2 ml300 ocotea \
- OCRTC ORSG p3p440 PCI405 \
- pcs440ep PIP405 PLU405 PMC405 \
- PPChameleonEVB sbc405 sequoia sequoia_nand \
- VOH405 VOM405 W7OLMC W7OLMG \
- walnut WUH405 XPEDITE1K yellowstone \
- yosemite yucca bamboo \
++ ADCIOP alpr AP1000 AR405 \
++ ASH405 bamboo bubinga CANBT \
++ CMS700 CPCI2DP CPCI405 CPCI4052 \
++ CPCI405AB CPCI405DT CPCI440 CPCIISER4 \
++ CRAYL1 csb272 csb472 DASA_SIM \
++ DP405 DU405 ebony ERIC \
++ EXBITGEN G2000 HH405 HUB405 \
++ JSE KAREF luan METROBOX \
++ MIP405 MIP405T ML2 ml300 \
++ ocotea OCRTC ORSG p3p440 \
++ PCI405 pcs440ep PIP405 PLU405 \
++ PMC405 PPChameleonEVB sbc405 sequoia \
++ sequoia_nand VOH405 VOM405 W7OLMC \
+ W7OLMG walnut WUH405 XPEDITE1K \
+ yellowstone yosemite yucca bamboo \
"
#########################################################################
diff --cc Makefile
index fc4ffd848c2f7460d473dd66335742b7e3686523,f48ca6cebb5881dba42f9c5d8f98e3f73ffb3c1d..3ffca2f9ec2a8858f3406f272b165879a63eb1fb
+++ b/Makefile
xtract_4xx = $(subst _25,,$(subst _33,,$(subst _BA,,$(subst _ME,,$(subst _HI,,$(subst _config,,$1))))))
ADCIOP_config: unconfig
- @./mkconfig $(@:_config=) ppc ppc4xx adciop esd
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx adciop esd
+alpr_config: unconfig
+ @./mkconfig $(@:_config=) ppc ppc4xx alpr prodrive
+
AP1000_config:unconfig
- @./mkconfig $(@:_config=) ppc ppc4xx ap1000 amirix
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx ap1000 amirix
APC405_config: unconfig
- @./mkconfig $(@:_config=) ppc ppc4xx apc405 esd
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx apc405 esd
AR405_config: unconfig
- @./mkconfig $(@:_config=) ppc ppc4xx ar405 esd
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx ar405 esd
ASH405_config: unconfig
- @./mkconfig $(@:_config=) ppc ppc4xx ash405 esd
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx ash405 esd
bamboo_config: unconfig
- @./mkconfig $(@:_config=) ppc ppc4xx bamboo amcc
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx bamboo amcc
bubinga_config: unconfig
- @./mkconfig $(@:_config=) ppc ppc4xx bubinga amcc
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx bubinga amcc
CANBT_config: unconfig
- @./mkconfig $(@:_config=) ppc ppc4xx canbt esd
+ @$(MKCONFIG) $(@:_config=) ppc ppc4xx canbt esd
CATcenter_config \
CATcenter_25_config \
diff --cc board/prodrive/alpr/Makefile
index 8fc60095e1c1ce8ff0eb338dab0516f4514ad0bb,0000000000000000000000000000000000000000..993ad1995d471b9850499b473cf3d073909b6907
mode 100644,000000..100644
mode 100644,000000..100644
--- /dev/null
- LIB = lib$(BOARD).a
+#
+# (C) Copyright 2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
- OBJS = $(BOARD).o fpga.o nand.o
++LIB = $(obj)lib$(BOARD).a
+
- .depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
++COBJS = $(BOARD).o fpga.o nand.o
+SOBJS = init.o
+
++SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
++OBJS := $(addprefix $(obj),$(COBJS))
++SOBJS := $(addprefix $(obj),$(SOBJS))
++
+$(LIB): $(OBJS) $(SOBJS)
+ $(AR) crv $@ $(OBJS)
+
+clean:
+ rm -f $(SOBJS) $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak .depend *~
+
+#########################################################################
+
- sinclude .depend
++# defines $(obj).depend target
++include $(SRCTREE)/rules.mk
+
++sinclude $(obj).depend
+
+#########################################################################
diff --cc common/Makefile
Simple merge
diff --cc common/altera.c
index 357d70234c5f03ba14b43e8ccd693c7cf451fb9d,ebd50382c63225eedf2dedc2b1ec06db43a19489..06e8a9501585a521dc4bba11a343cc02ab8423b0
--- 1/common/altera.c
--- 2/common/altera.c
+++ b/common/altera.c
{
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) {
{
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) {
{
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:
{
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 02d3e42b3bbf076db365aba7d9a59c104d52ff9b,02d3e42b3bbf076db365aba7d9a59c104d52ff9b..2eff239c47863bd59d44fb451c964ac8f47a19e3
--- 1/common/fpga.c
--- 2/common/fpga.c
+++ b/common/fpga.c
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:
#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:
#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:
#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:
diff --cc cpu/ppc4xx/405gp_pci.c
Simple merge
diff --cc include/ppc440.h
Simple merge