---

yaml --- r: 77395 b: refs/heads/master c: 7a1a6d0 h: refs/heads/master i: 77393: f640c76 77391: 74172f3 v: v3
git-mirror · Jan 11, 2008 · 8473fbd · 8473fbd
1 parent 2580bf1
commit 8473fbd
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aee3a29240ad167ad7875d859506d8bb90431c70
+refs/heads/master: 7a1a6d00618bce53ae88e501ff5d4b82522db926
diff --git a/trunk/arch/blackfin/Makefile b/trunk/arch/blackfin/Makefile
@@ -82,6 +82,8 @@ core-y   += arch/$(ARCH)/mach-$(MACHINE)/
 core-y   += arch/$(ARCH)/mach-$(MACHINE)/boards/
 endif
 
+core-y	 += arch/$(ARCH)/kernel/cplb-nompu/
+
 libs-y   += arch/$(ARCH)/lib/
 
 drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/

diff --git a/trunk/arch/blackfin/kernel/Makefile b/trunk/arch/blackfin/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := init_task.o vmlinux.lds
 obj-y := \
 	entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \
 	sys_bfin.o time.o traps.o irqchip.o dma-mapping.o flat.o \
-	fixed_code.o cplbinit.o cacheinit.o reboot.o bfin_gpio.o
+	fixed_code.o reboot.o bfin_gpio.o
 
 obj-$(CONFIG_BFIN_GPTIMERS)          += gptimers.o
 obj-$(CONFIG_MODULES)                += module.o

diff --git a/trunk/arch/blackfin/kernel/cplb-nompu/Makefile b/trunk/arch/blackfin/kernel/cplb-nompu/Makefile
@@ -0,0 +1,8 @@
+#
+# arch/blackfin/kernel/cplb-nompu/Makefile
+#
+
+obj-y := cplbinit.o cacheinit.o cplbhdlr.o cplbmgr.o
+
+obj-$(CONFIG_CPLB_INFO) += cplbinfo.o
+
diff --git a/trunk/arch/blackfin/kernel/cacheinit.c → ...ch/blackfin/kernel/cplb-nompu/cacheinit.c b/trunk/arch/blackfin/kernel/cacheinit.c → ...ch/blackfin/kernel/cplb-nompu/cacheinit.c
diff --git a/trunk/arch/blackfin/mach-common/cplbhdlr.S → ...rch/blackfin/kernel/cplb-nompu/cplbhdlr.S b/trunk/arch/blackfin/mach-common/cplbhdlr.S → ...rch/blackfin/kernel/cplb-nompu/cplbhdlr.S
diff --git a/trunk/arch/blackfin/mach-common/cplbinfo.c → ...rch/blackfin/kernel/cplb-nompu/cplbinfo.c b/trunk/arch/blackfin/mach-common/cplbinfo.c → ...rch/blackfin/kernel/cplb-nompu/cplbinfo.c
diff --git a/trunk/arch/blackfin/kernel/cplbinit.c → ...rch/blackfin/kernel/cplb-nompu/cplbinit.c b/trunk/arch/blackfin/kernel/cplbinit.c → ...rch/blackfin/kernel/cplb-nompu/cplbinit.c
diff --git a/trunk/arch/blackfin/mach-common/cplbmgr.S → ...arch/blackfin/kernel/cplb-nompu/cplbmgr.S b/trunk/arch/blackfin/mach-common/cplbmgr.S → ...arch/blackfin/kernel/cplb-nompu/cplbmgr.S
diff --git a/trunk/arch/blackfin/mach-common/Makefile b/trunk/arch/blackfin/mach-common/Makefile
@@ -3,10 +3,9 @@
 #
 
 obj-y := \
-	cache.o cacheinit.o cplbhdlr.o cplbmgr.o entry.o \
+	cache.o cacheinit.o entry.o \
 	interrupt.o lock.o irqpanic.o arch_checks.o
 
-obj-$(CONFIG_CPLB_INFO)          += cplbinfo.o
 obj-$(CONFIG_BFIN_SINGLE_CORE)   += ints-priority-sc.o
 obj-$(CONFIG_BFIN_DUAL_CORE)     += ints-priority-dc.o
 obj-$(CONFIG_PM)                 += pm.o dpmc.o