---

yaml --- r: 302679 b: refs/heads/master c: 453549d h: refs/heads/master i: 302677: 28c8121 302675: 95e95d6 302671: 115eb08 v: v3
git-mirror · May 20, 2012 · 8ad52a9 · 8ad52a9
1 parent e992ff7
commit 8ad52a9
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 22 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e33e73f560fcd612603b915357e5931d2217b1b2
+refs/heads/master: 453549d2e511a8490e04f91b084aa418f9f4e5d2
diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile
@@ -115,7 +115,6 @@ core-$(CONFIG_M68000)		+= arch/m68k/platform/68328/
 core-$(CONFIG_M68EZ328)		+= arch/m68k/platform/68EZ328/
 core-$(CONFIG_M68VZ328)		+= arch/m68k/platform/68VZ328/
 core-$(CONFIG_COLDFIRE)		+= arch/m68k/platform/coldfire/
-core-$(CONFIG_M54xx)		+= arch/m68k/platform/54xx/
 
 
 all:	zImage

diff --git a/trunk/arch/m68k/platform/54xx/Makefile b/trunk/arch/m68k/platform/54xx/Makefile
diff --git a/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile
@@ -26,10 +26,11 @@ obj-$(CONFIG_M528x)	+= m528x.o pit.o intc-2.o reset.o
 obj-$(CONFIG_M5307)	+= m5307.o timers.o intc.o reset.o
 obj-$(CONFIG_M532x)	+= m532x.o timers.o intc-simr.o reset.o
 obj-$(CONFIG_M5407)	+= m5407.o timers.o intc.o reset.o
-obj-$(CONFIG_M54xx)	+= sltimers.o intc-2.o
+obj-$(CONFIG_M54xx)	+= m54xx.o sltimers.o intc-2.o
 
 obj-$(CONFIG_NETtel)	+= nettel.o
 obj-$(CONFIG_CLEOPATRA)	+= nettel.o
+obj-$(CONFIG_FIREBEE)	+= firebee.o
 
 obj-y			+= pinmux.o gpio.o
 extra-y := head.o
diff --git a/trunk/arch/m68k/platform/54xx/firebee.c → trunk/arch/m68k/platform/coldfire/firebee.c b/trunk/arch/m68k/platform/54xx/firebee.c → trunk/arch/m68k/platform/coldfire/firebee.c
diff --git a/trunk/arch/m68k/platform/54xx/config.c → trunk/arch/m68k/platform/coldfire/m54xx.c b/trunk/arch/m68k/platform/54xx/config.c → trunk/arch/m68k/platform/coldfire/m54xx.c