Merge with git+ssh://fifi/home/wd/git/u-boot/master

diff --git a/CHANGELOG b/CHANGELOG
index c919b5b..ff6eadb 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,12 @@ Changes since U-Boot 1.1.4:
 * 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 --git a/Makefile b/Makefile
index 128ae59..4d579d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -325,6 +325,7 @@ lite5200b_LOWBOOT_config:   unconfig
 mcc200_config  \
 mcc200_SDRAM   \
 mcc200_highboot        \
+mcc200_COM12   \
 mcc200_highboot_SDRAM: unconfig
        @ >include/config.h
        @[ -n "$(findstring highboot,$@)" ] || \
@@ -341,6 +342,10 @@ mcc200_highboot_SDRAM:     unconfig
                { echo "#define CONFIG_MCC200_SDRAM"    >>include/config.h ; \
                  echo "... with SDRAM" ; \
                }
+       @[ -z "$(findstring COM12,$@)" ] || \
+               { echo "#define CONFIG_CONSOLE_COM12"   >>include/config.h ; \
+                 echo "... with console on COM12" ; \
+               }
        @./mkconfig -a mcc200 ppc mpc5xxx mcc200
 
 o2dnt_config:

diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 167dc0f..775030c 100644 (file)
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -203,6 +203,8 @@ int checkboard (void)
 
 int misc_init_r (void)
 {
+       ulong flash_sup_end, snum;
+
        /*
         * Adjust flash start and offset to detected values
         */
@@ -257,6 +259,12 @@ int misc_init_r (void)
                               (flash_info[0].start[0] - 1) + flash_info[0].size,
                               &flash_info[0]);
                *(volatile int*)MPC5XXX_CS0_CFG &= ~(1 << 6);
+               printf ("Warning: Only 32 of 64 MB of Flash are accessible from U-Boot\n");
+               flash_info[0].size = 32 << 20;
+               for (snum = 0, flash_sup_end = gd->bd->bi_flashstart + (32<<20); 
+                       flash_info[0].start[snum] < flash_sup_end; 
+                       snum++);
+               flash_info[0].sector_count = snum;
        }
 
        return (0);

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index ce33b85..563f797 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -51,15 +51,20 @@
  *  To select console on the one of 8 external UARTs,
  * define CONFIG_QUART_CONSOLE as 1, 2, 3, or 4 for the first Quad UART,
  * or as 5, 6, 7, or 8 for the second Quad UART.
+ * COM11, COM12, COM13, COM14 are located on the second Quad UART.
  *
  *  CONFIG_PSC_CONSOLE must be undefined in this case.
  */
-/* #define CONFIG_QUART_CONSOLE        1       */ /* console is on UART1 of QUART1     */
+#ifdef CONFIG_CONSOLE_COM12
+#define CONFIG_QUART_CONSOLE   6       /* console is on UARTF of QUART2        */
+#else
+#define CONFIG_QUART_CONSOLE   8       /* console is on UARTH of QUART2        */
+#endif
 /*
  *  To select console on PSC1, define CONFIG_PSC_CONSOLE as 1
  * and undefine CONFIG_QUART_CONSOLE.
  */
-#define CONFIG_PSC_CONSOLE     1       /* console is on PSC1                   */
+/*#define CONFIG_PSC_CONSOLE   1       */ /* console is on PSC1                */
 #if defined(CONFIG_QUART_CONSOLE) && defined(CONFIG_PSC_CONSOLE)
 #error "Select only one console device!"
 #endif

diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 884f85c..a6532b5 100644 (file)
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -31,9 +31,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define DEBUG
-#undef DEBUG
-
 /*-----------------------------------------------------------------------
  * High Level Configuration Options
  *----------------------------------------------------------------------*/