From 7a1a6d00618bce53ae88e501ff5d4b82522db926 Mon Sep 17 00:00:00 2001 From: Bernd Schmidt Date: Fri, 11 Jan 2008 16:58:44 +0800 Subject: [PATCH] [Blackfin] arch: move all code related to CPLB handling into a new subdirectory under kernel/ Signed-off-by: Bernd Schmidt Signed-off-by: Bryan Wu --- arch/blackfin/Makefile | 2 ++ arch/blackfin/kernel/Makefile | 2 +- arch/blackfin/kernel/cplb-nompu/Makefile | 8 ++++++++ arch/blackfin/kernel/{ => cplb-nompu}/cacheinit.c | 0 .../{mach-common => kernel/cplb-nompu}/cplbhdlr.S | 0 .../{mach-common => kernel/cplb-nompu}/cplbinfo.c | 0 arch/blackfin/kernel/{ => cplb-nompu}/cplbinit.c | 0 .../blackfin/{mach-common => kernel/cplb-nompu}/cplbmgr.S | 0 arch/blackfin/mach-common/Makefile | 3 +-- 9 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 arch/blackfin/kernel/cplb-nompu/Makefile rename arch/blackfin/kernel/{ => cplb-nompu}/cacheinit.c (100%) rename arch/blackfin/{mach-common => kernel/cplb-nompu}/cplbhdlr.S (100%) rename arch/blackfin/{mach-common => kernel/cplb-nompu}/cplbinfo.c (100%) rename arch/blackfin/kernel/{ => cplb-nompu}/cplbinit.c (100%) rename arch/blackfin/{mach-common => kernel/cplb-nompu}/cplbmgr.S (100%) diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 0c9680eac8ef..2fc899c5e45f 100644 --- a/arch/blackfin/Makefile +++ b/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/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile index 8a4cfb293b27..318b9b692a48 100644 --- a/arch/blackfin/kernel/Makefile +++ b/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/arch/blackfin/kernel/cplb-nompu/Makefile b/arch/blackfin/kernel/cplb-nompu/Makefile new file mode 100644 index 000000000000..d36ea9b5382e --- /dev/null +++ b/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/arch/blackfin/kernel/cacheinit.c b/arch/blackfin/kernel/cplb-nompu/cacheinit.c similarity index 100% rename from arch/blackfin/kernel/cacheinit.c rename to arch/blackfin/kernel/cplb-nompu/cacheinit.c diff --git a/arch/blackfin/mach-common/cplbhdlr.S b/arch/blackfin/kernel/cplb-nompu/cplbhdlr.S similarity index 100% rename from arch/blackfin/mach-common/cplbhdlr.S rename to arch/blackfin/kernel/cplb-nompu/cplbhdlr.S diff --git a/arch/blackfin/mach-common/cplbinfo.c b/arch/blackfin/kernel/cplb-nompu/cplbinfo.c similarity index 100% rename from arch/blackfin/mach-common/cplbinfo.c rename to arch/blackfin/kernel/cplb-nompu/cplbinfo.c diff --git a/arch/blackfin/kernel/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c similarity index 100% rename from arch/blackfin/kernel/cplbinit.c rename to arch/blackfin/kernel/cplb-nompu/cplbinit.c diff --git a/arch/blackfin/mach-common/cplbmgr.S b/arch/blackfin/kernel/cplb-nompu/cplbmgr.S similarity index 100% rename from arch/blackfin/mach-common/cplbmgr.S rename to arch/blackfin/kernel/cplb-nompu/cplbmgr.S diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile index 4d7733dfd5de..8636d4284bdb 100644 --- a/arch/blackfin/mach-common/Makefile +++ b/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