Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/arch/ppc/boot/simple
Modified Files:
Makefile misc-embedded.c
Log Message:
Merged 2.6.22.
Updated drivers to use in_be* and out_be* instead of read* and write*
input/output instructions.
Updated DI driver:
- do not use debug extensions with unknown drive models
- do not load custom firmware on xenogc/duoq
- evict alien firmwares and load custom formware on known drive models
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile 30 Apr 2007 17:06:11 -0000 1.18
+++ Makefile 14 Nov 2007 23:08:46 -0000 1.19
@@ -205,6 +205,7 @@
endif
boot-$(CONFIG_SERIAL_MPC52xx_CONSOLE) += mpc52xx_tty.o
boot-$(CONFIG_SERIAL_MPSC_CONSOLE) += mv64x60_tty.o
+boot-$(CONFIG_SERIAL_UARTLITE_CONSOLE) += uartlite_tty.o
LIBS := $(common)/lib.a $(bootlib)/lib.a
ifeq ($(CONFIG_PPC_PREP),y)
Index: misc-embedded.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/misc-embedded.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- misc-embedded.c 17 Feb 2007 23:43:40 -0000 1.8
+++ misc-embedded.c 14 Nov 2007 23:08:46 -0000 1.9
@@ -138,7 +138,7 @@
/*
* We link ourself to an arbitrary low address. When we run, we
- * relocate outself to that address. __image_being points to
+ * relocate ourself to that address. __image_being points to
* the part of the image where the zImage is. -- Tom
*/
zimage_start = (char *)(unsigned long)(&__image_begin);
|
