diff options
| author | Greg Ungerer | 2012-04-17 15:38:31 +1000 |
|---|---|---|
| committer | Greg Ungerer | 2012-05-20 21:22:06 +1000 |
| commit | e33e73f560fcd612603b915357e5931d2217b1b2 (patch) | |
| tree | bd5b8b9878c52af9bb5729ace772582975886517 | |
| parent | 9f8c8c072dd0ce0c76dfd2277169f933b0cc6ca5 (diff) | |
m68knommu: move the 532x platform code into the common ColdFire code directory
All these separate directories for each ColdFire CPU SoC varient seems like
overkill. The majority of them only contain a single small config file. Move
these into the common ColdFire code directory.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/Makefile | 1 | ||||
| -rw-r--r-- | arch/m68k/platform/532x/Makefile | 18 | ||||
| -rw-r--r-- | arch/m68k/platform/coldfire/Makefile | 2 | ||||
| -rw-r--r-- | arch/m68k/platform/coldfire/m532x.c (renamed from arch/m68k/platform/532x/config.c) | 0 |
4 files changed, 1 insertions, 20 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 333c0c2e0cd7..3154f0f41edd 100644 --- a/arch/m68k/Makefile +++ b/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_M532x) += arch/m68k/platform/532x/ core-$(CONFIG_M54xx) += arch/m68k/platform/54xx/ diff --git a/arch/m68k/platform/532x/Makefile b/arch/m68k/platform/532x/Makefile deleted file mode 100644 index c0d8cf88f4fd..000000000000 --- a/arch/m68k/platform/532x/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# Makefile for the m68knommu linux kernel. -# - -# -# If you want to play with the HW breakpoints then you will -# need to add define this, which will give you a stack backtrace -# on the console port whenever a DBG interrupt occurs. You have to -# set up you HW breakpoints to trigger a DBG interrupt: -# -# ccflags-y := -DTRAP_DBG_INTERRUPT -# asflags-y := -DTRAP_DBG_INTERRUPT -# - -asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 - -#obj-y := config.o usb-mcf532x.o spi-mcf532x.o -obj-y := config.o diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile index 48dcd066f163..d6089c11a682 100644 --- a/arch/m68k/platform/coldfire/Makefile +++ b/arch/m68k/platform/coldfire/Makefile @@ -24,7 +24,7 @@ obj-$(CONFIG_M527x) += m527x.o pit.o intc-2.o reset.o obj-$(CONFIG_M5272) += m5272.o intc-5272.o timers.o 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) += timers.o intc-simr.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 diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/coldfire/m532x.c index 8e9476d59a65..8e9476d59a65 100644 --- a/arch/m68k/platform/532x/config.c +++ b/arch/m68k/platform/coldfire/m532x.c |