[PPC32] Merge MPC52xx changes with recent CPM changes.

diff --cc arch/ppc/Kconfig
Simple merge

diff --cc arch/ppc/boot/common/misc-common.c
index 34d405e1425c40557a145d13355e43802ae0d0f7,e9796e09e883a5e20c75197c45b5fadc5183583e..868fa81b7708fdc36d3879df2459197a486ba26d
--- 1/arch/ppc/boot/common/misc-common.c
--- 2/arch/ppc/boot/common/misc-common.c
+++ b/arch/ppc/boot/common/misc-common.c
@@@ -59,7 -59,7 +59,8 @@@ static int _cvt(unsigned long val, cha
  void _vprintk(void(*putc)(const char), const char *fmt0, va_list ap);
  unsigned char *ISA_io = NULL;
  
- #if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
 -#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
++#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
++      || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
  extern unsigned long com_port;
  
  extern int serial_tstc(unsigned long com_port);
@@@ -80,7 -80,7 +81,8 @@@ void exit(void
  
  int tstc(void)
  {
- #if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
 -#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
++#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
++      || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
        if(keyb_present)
                return (CRT_tstc() || serial_tstc(com_port));
        else
@@@ -93,7 -93,7 +95,8 @@@
  int getc(void)
  {
        while (1) {
- #if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
 -#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
++#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
++      || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
                if (serial_tstc(com_port))
                        return (serial_getc(com_port));
  #endif /* serial console */
@@@ -108,7 -108,7 +111,8 @@@ putc(const char c
  {
        int x,y;
  
- #if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
 -#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
++#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
++      || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
        serial_putc(com_port, c);
        if ( c == '\n' )
                serial_putc(com_port, '\r');
@@@ -155,7 -155,7 +159,8 @@@ void puts(const char *s
        y = orig_y;
  
        while ( ( c = *s++ ) != '\0' ) {
- #if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
 -#if defined(CONFIG_SERIAL_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
++#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) \
++      || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)
                serial_putc(com_port, c);
                if ( c == '\n' ) serial_putc(com_port, '\r');
  #endif /* serial console */

diff --cc arch/ppc/boot/simple/Makefile
index c1dfd237134250909e51d6fe58a1c7d929babe40,d2cb412de7bf01e929ab56f074e4f0ce52fdd86b..e31b7e4991226d961821f43d75d4f5d4b2d44202
--- 1/arch/ppc/boot/simple/Makefile
--- 2/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@@ -139,11 -145,12 +145,12 @@@ boot-$(CONFIG_MBX)              += iic.o pci.o qspa
  boot-$(CONFIG_RPXCLASSIC)     += iic.o pci.o qspan_pci.o
  boot-$(CONFIG_RPXLITE)                += iic.o
  # Different boards need different serial implementations.
 -ifeq ($(CONFIG_SERIAL_CONSOLE),y)
 +ifeq ($(CONFIG_SERIAL_CPM_CONSOLE),y)
  boot-$(CONFIG_8xx)            += m8xx_tty.o
  boot-$(CONFIG_8260)           += m8260_tty.o
 -boot-$(CONFIG_GT64260_CONSOLE)        += gt64260_tty.o
  endif
+ boot-$(CONFIG_SERIAL_MPC52xx_CONSOLE) += mpc52xx_tty.o
 +boot-$(CONFIG_GT64260_CONSOLE)        += gt64260_tty.o
  
  LIBS                          := $(common)/lib.a $(bootlib)/lib.a
  ifeq ($(CONFIG_PPC_PREP),y)

diff --cc arch/ppc/platforms/Makefile
Simple merge