# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1249941526 18000
# Node ID 48c9887b1b48ab01c0def46031031ccc0079fbcd
# Parent  9360c97848b6e97b72fc429b2b4524099405f008
imported patch comcerto-makefile

diff -r 9360c97848b6 -r 48c9887b1b48 arch/arm/Makefile
--- a/arch/arm/Makefile	Mon Aug 10 16:58:46 2009 -0500
+++ b/arch/arm/Makefile	Mon Aug 10 16:58:46 2009 -0500
@@ -121,6 +121,12 @@
  machine-$(CONFIG_ARCH_IOP33X)	   := iop33x
  machine-$(CONFIG_ARCH_IOP13XX)	   := iop13xx
     plat-$(CONFIG_PLAT_IOP)	   := iop
+ machine-$(CONFIG_ARCH_COMCERTO)   := comcerto
+ifeq ($(CONFIG_ARCH_COMCERTO),y)
+# First 8MB of memory (ZONE_DMA) are l2 non-cacheable
+# Move kernel 8MB higher in order the kernel code to be l2 cacheable
+ textofs-$(CONFIG_ARCH_COMCERTO)	   := 0x00C08000
+endif
  machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx
  machine-$(CONFIG_ARCH_IXP2000)    := ixp2000
  machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx
diff -r 9360c97848b6 -r 48c9887b1b48 arch/arm/mach-comcerto/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/arch/arm/mach-comcerto/Makefile	Mon Aug 10 16:58:46 2009 -0500
@@ -0,0 +1,32 @@
+#
+# Makefile for the linux kernel.
+#
+# Note! Dependencies are done automagically by 'make dep', which also
+# removes any old dependencies. DON'T put your own dependencies here
+# unless it's something special (ie not a .c file).
+
+
+# Object file lists.
+
+obj-y						+= comcerto-common.o
+obj-$(CONFIG_ARCH_M821XX) 			+= comcerto-100.o
+obj-$(CONFIG_ARCH_M822XX) 			+= comcerto-50.o
+obj-$(CONFIG_ARCH_M828XX) 			+= comcerto-800.o
+obj-$(CONFIG_ARCH_M829XX) 			+= comcerto-900.o
+
+obj-$(CONFIG_EVM_SUPERMOMBASA)			+= board-nairobi.o
+obj-$(CONFIG_EVM_ASIC) 				+= board-asic.o
+obj-$(CONFIG_EVM_ROUTER) 			+= board-router.o
+obj-$(CONFIG_EVM_PACKET_IAD)			+= board-packet_iad.o
+obj-$(CONFIG_EVM_FEROUTER) 			+= board-ferouter.o
+obj-$(CONFIG_COMCERTO_TDM_CLOCK)		+= sysfstdm.o
+
+ifeq ($(CONFIG_PCI),y)
+	obj-y += pci-common.o
+	obj-$(CONFIG_ARCH_M821XX) 		+= pci-comcerto100.o
+	obj-$(CONFIG_ARCH_M822XX) 		+= pci-comcerto50.o
+	obj-$(CONFIG_ARCH_M828XX) 		+= pci-comcerto800.o
+	obj-$(CONFIG_COMCERTO_PCI_TX_DMA_ARAM)	+= aram.o
+endif
+
+
diff -r 9360c97848b6 -r 48c9887b1b48 arch/arm/mach-comcerto/Makefile.boot
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/arch/arm/mach-comcerto/Makefile.boot	Mon Aug 10 16:58:46 2009 -0500
@@ -0,0 +1,20 @@
+
+ifeq ($(CONFIG_ARCH_M828XX),y)
+   zreladdr-y     := 0x00808000
+   params_phys-y  := 0x00800100
+endif
+
+ifeq ($(CONFIG_ARCH_M821XX),y)
+   zreladdr-y     := 0x81408000
+   params_phys-y  := 0x80800100
+endif
+
+ifeq ($(CONFIG_ARCH_M822XX),y)
+   zreladdr-y     := 0x81408000
+   params_phys-y  := 0x80800100
+endif
+
+ifeq ($(CONFIG_ARCH_M829XX),y)
+   zreladdr-y     := 0x80808000
+   params_phys-y  := 0x80800100
+endif
