* Add comment about non-GPL character of standalone applications to

  COPYING file

* Fix FEC ethernet problem on NSCU board.

diff --git a/CHANGELOG b/CHANGELOG
index 95dadc0099c417cfde3e7734698b4da405e0d02f..1d4a0934b7ef19d92acc4795510979d7d8714b13 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Add comment about non-GPL character of standalone applications to
+  COPYING file
+
+* Fix FEC ethernet problem on NSCU board.
+
 * Patch by Gary Jennejohn, 09 Sep 2004:
   allow to use USART1 as console port on at91rm9200dk boards
 

diff --git a/COPYING b/COPYING
index 5a965fbc58c9914c3e70e7eb0681acc3a3acd281..1a34e3dc0cbdfc18fd86a77a4d302cb2f291f15c 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,14 @@
+  NOTE! This copyright does *not* cover the so-called "standalone"
+applications that use U-Boot services by means of the jump table
+provided by U-Boot exactly for this purpose - this is merely
+considered normal use of U-Boot, and does *not* fall under the
+heading of "derived work". Also note that the GPL below is
+copyrighted by the Free Software Foundation, but the instance of code
+that it refers to (the U-Boot source code) is copyrighted by me and
+others who actually wrote it. -- Wolfgang Denk
+
+=======================================================================
+
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 

diff --git a/include/commproc.h b/include/commproc.h
index 83119717a9c30377d8e654b17bbe1f6f734214bf..790016655e20b2d0af79d672784abdbb539250e7 100644 (file)
--- a/include/commproc.h
+++ b/include/commproc.h
@@ -74,7 +74,7 @@
 #define CPM_I2C_BASE           0x0820
 #define CPM_SPI_BASE           0x0840
 #define CPM_FEC_BASE           0x0860
-#define CPM_SERIAL2_BASE       0x0880
+#define CPM_SERIAL2_BASE       0x08E0
 #define CPM_SCC_BASE           0x0900
 #define CPM_POST_BASE          0x0980
 #define CPM_WLKBD_BASE         0x0a00

diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index f13cb345c3955fbc14c808d83c873f63bb089947..6765131ea2da23f6c4e8aa41ce1ae89e311fe4b5 100644 (file)
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -284,7 +284,7 @@
 #define CFG_PCMCIA_IO_SIZE     ( 64 << 20 )
 #define PCMCIA_MEM_WIN_NO      8 /* override default 4 in pcmcia.h */
 #define        PCMCIA_SOCKETS_NO       2 /* we have two sockets */
-#define NSCU_OE_INV            1 /* PCMCIA_GCRX_CXOE is inverted on early boards */
+#undef NSCU_OE_INV             /* PCMCIA_GCRX_CXOE was inverted on early boards */
 
 /*-----------------------------------------------------------------------
  * IDE/ATA stuff (Supports IDE harddisk on PCMCIA Adapter)