[LV-kern-commit] CVS: kernel-2.4/arch/arm/boot Makefile,1.1.1.2,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/arm/boot
In directory usw-pr-cvs1:/tmp/cvs-serv24336/arm/boot

Modified Files:
	Makefile 
Log Message:
synch 2.4.15 commit 32


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/arm/boot/Makefile,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- Makefile	25 Feb 2001 23:15:20 -0000	1.1.1.2
+++ Makefile	10 Apr 2002 13:51:20 -0000	1.2
@@ -55,8 +55,7 @@
 endif
 
 ifeq ($(CONFIG_ARCH_NEXUSPCI),y)
-ZTEXTADDR	 = 0x40200000
-ZRELADDR	 = 0x40008000
+ZTEXTADDR	 = 0x40008000
 endif
 
 ifeq ($(CONFIG_ARCH_L7200),y)
@@ -70,13 +69,21 @@
 ZBSSADDR	 = 0xf03e0000
 endif
 
-ifeq ($(CONFIG_ARCH_P720T),y)
-ZTEXTADDR	 = 0xc0018000
-ZRELADDR	 = 0xc0018000
+# The standard locations for stuff on CLPS711x type processors
+ifeq ($(CONFIG_ARCH_CLPS711X),y)
+ZTEXTADDR	 = 0xc0028000
 PARAMS_PHYS	 = 0xc0000100
+endif
+
+# Should probably have some agreement on these...
+ifeq ($(CONFIG_ARCH_P720T),y)
 INITRD_PHYS	 = 0xc0400000
 INITRD_VIRT	 = 0xc0400000
 endif
+ifeq ($(CONFIG_ARCH_CDB89712),y)
+INITRD_PHYS	 = 0x00700000
+INITRD_VIRT	 = 0xc0300000
+endif
 
 ifeq ($(CONFIG_ARCH_SA1100),y)
 ZTEXTADDR	 = 0xc0008000
@@ -92,9 +99,23 @@
 ifeq ($(CONFIG_SA1100_GRAPHICSCLIENT),y)
   ZTEXTADDR	 = 0xC0200000
 endif
+ifeq ($(CONFIG_SA1100_GRAPHICSMASTER),y)
+  ZTEXTADDR	 = 0xC0400000
+endif
+ifeq ($(CONFIG_SA1100_ADSBITSY),y)
+  ZTEXTADDR	 = 0xC0400000
+endif
+ifeq ($(CONFIG_SA1100_YOPY),y)
+  ZTEXTADDR      = 0x00080000
+  ZBSSADDR       = 0xc0200000
+endif
 ifeq ($(CONFIG_SA1111),y)
   ZRELADDR	 = 0xc0208000
 endif
+endif
+
+ifeq ($(CONFIG_ARCH_ANAKIN),y)
+ZTEXTADDR	 = 0x20008000
 endif
 
 #