git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
simple
/
misc.c
diff --git
a/arch/ppc/boot/simple/misc.c
b/arch/ppc/boot/simple/misc.c
index
1b2ae8d
..
ab0f990
100644
(file)
--- a/
arch/ppc/boot/simple/misc.c
+++ b/
arch/ppc/boot/simple/misc.c
@@
-50,7
+50,8
@@
*/
#if (defined(CONFIG_SERIAL_8250_CONSOLE) \
|| defined(CONFIG_VGA_CONSOLE) \
*/
#if (defined(CONFIG_SERIAL_8250_CONSOLE) \
|| defined(CONFIG_VGA_CONSOLE) \
- || defined(CONFIG_SERIAL_MPC52xx_CONSOLE)) \
+ || defined(CONFIG_SERIAL_MPC52xx_CONSOLE) \
+ || defined(CONFIG_SERIAL_MPSC_CONSOLE)) \
&& !defined(CONFIG_GEMINI)
#define INTERACTIVE_CONSOLE 1
#endif
&& !defined(CONFIG_GEMINI)
#define INTERACTIVE_CONSOLE 1
#endif
@@
-98,11
+99,11
@@
decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
struct bi_record *rec;
unsigned long initrd_loc = 0, TotalMemory = 0;
struct bi_record *rec;
unsigned long initrd_loc = 0, TotalMemory = 0;
-#if
def CONFIG_SERIAL_8250_CONSOLE
+#if
defined(CONFIG_SERIAL_8250_CONSOLE) || defined(CONFIG_SERIAL_MPSC_CONSOLE)
com_port = serial_init(0, NULL);
#endif
com_port = serial_init(0, NULL);
#endif
-#if
def CONFIG_44x
+#if
defined(CONFIG_44x) && defined(PPC44x_EMAC0_MR0)
/* Reset MAL */
mtdcr(DCRN_MALCR(DCRN_MAL_BASE), MALCR_MMSR);
/* Wait for reset */
/* Reset MAL */
mtdcr(DCRN_MALCR(DCRN_MAL_BASE), MALCR_MMSR);
/* Wait for reset */