diff options
author | Greg Ungerer <gerg@uclinux.org> | 2012-04-17 01:33:13 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2012-05-20 07:22:02 -0400 |
commit | 40711ccb22bb3f851291fa4b9d59a5a4ec6f7949 (patch) | |
tree | 3f0bade622eeefa5d5399128cd9501025906d4e5 /arch/m68k | |
parent | 2d11251168d1f4104b4824893288f1220ead22b3 (diff) |
m68knommu: move the 5272 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>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/Makefile | 1 | ||||
-rw-r--r-- | arch/m68k/platform/5272/Makefile | 18 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/Makefile | 2 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/intc-5272.c (renamed from arch/m68k/platform/5272/intc.c) | 0 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/m5272.c (renamed from arch/m68k/platform/5272/config.c) | 0 |
5 files changed, 1 insertions, 20 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 314c10c7bfd1..2d7a4d987cf6 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile | |||
@@ -116,7 +116,6 @@ core-$(CONFIG_M68EZ328) += arch/m68k/platform/68EZ328/ | |||
116 | core-$(CONFIG_M68VZ328) += arch/m68k/platform/68VZ328/ | 116 | core-$(CONFIG_M68VZ328) += arch/m68k/platform/68VZ328/ |
117 | core-$(CONFIG_COLDFIRE) += arch/m68k/platform/coldfire/ | 117 | core-$(CONFIG_COLDFIRE) += arch/m68k/platform/coldfire/ |
118 | core-$(CONFIG_M527x) += arch/m68k/platform/527x/ | 118 | core-$(CONFIG_M527x) += arch/m68k/platform/527x/ |
119 | core-$(CONFIG_M5272) += arch/m68k/platform/5272/ | ||
120 | core-$(CONFIG_M528x) += arch/m68k/platform/528x/ | 119 | core-$(CONFIG_M528x) += arch/m68k/platform/528x/ |
121 | core-$(CONFIG_M5307) += arch/m68k/platform/5307/ | 120 | core-$(CONFIG_M5307) += arch/m68k/platform/5307/ |
122 | core-$(CONFIG_M532x) += arch/m68k/platform/532x/ | 121 | core-$(CONFIG_M532x) += arch/m68k/platform/532x/ |
diff --git a/arch/m68k/platform/5272/Makefile b/arch/m68k/platform/5272/Makefile deleted file mode 100644 index 932ddabdfe8a..000000000000 --- a/arch/m68k/platform/5272/Makefile +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the linux kernel. | ||
3 | # | ||
4 | |||
5 | # | ||
6 | # If you want to play with the HW breakpoints then you will | ||
7 | # need to add define this, which will give you a stack backtrace | ||
8 | # on the console port whenever a DBG interrupt occurs. You have to | ||
9 | # set up you HW breakpoints to trigger a DBG interrupt: | ||
10 | # | ||
11 | # ccflags-y := -DTRAP_DBG_INTERRUPT | ||
12 | # asflags-y := -DTRAP_DBG_INTERRUPT | ||
13 | # | ||
14 | |||
15 | asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1 | ||
16 | |||
17 | obj-y := config.o intc.o | ||
18 | |||
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile index 87ffd2ce374c..ec81d0545592 100644 --- a/arch/m68k/platform/coldfire/Makefile +++ b/arch/m68k/platform/coldfire/Makefile | |||
@@ -21,7 +21,7 @@ obj-$(CONFIG_M520x) += m520x.o pit.o intc-simr.o reset.o | |||
21 | obj-$(CONFIG_M523x) += m523x.o pit.o dma_timer.o intc-2.o reset.o | 21 | obj-$(CONFIG_M523x) += m523x.o pit.o dma_timer.o intc-2.o reset.o |
22 | obj-$(CONFIG_M5249) += m5249.o timers.o intc.o intc-5249.o reset.o | 22 | obj-$(CONFIG_M5249) += m5249.o timers.o intc.o intc-5249.o reset.o |
23 | obj-$(CONFIG_M527x) += pit.o intc-2.o reset.o | 23 | obj-$(CONFIG_M527x) += pit.o intc-2.o reset.o |
24 | obj-$(CONFIG_M5272) += timers.o | 24 | obj-$(CONFIG_M5272) += m5272.o intc-5272.o timers.o |
25 | obj-$(CONFIG_M528x) += pit.o intc-2.o reset.o | 25 | obj-$(CONFIG_M528x) += pit.o intc-2.o reset.o |
26 | obj-$(CONFIG_M5307) += timers.o intc.o reset.o | 26 | obj-$(CONFIG_M5307) += timers.o intc.o reset.o |
27 | obj-$(CONFIG_M532x) += timers.o intc-simr.o reset.o | 27 | obj-$(CONFIG_M532x) += timers.o intc-simr.o reset.o |
diff --git a/arch/m68k/platform/5272/intc.c b/arch/m68k/platform/coldfire/intc-5272.c index 7160e618b0a9..7160e618b0a9 100644 --- a/arch/m68k/platform/5272/intc.c +++ b/arch/m68k/platform/coldfire/intc-5272.c | |||
diff --git a/arch/m68k/platform/5272/config.c b/arch/m68k/platform/coldfire/m5272.c index 43e36060da18..43e36060da18 100644 --- a/arch/m68k/platform/5272/config.c +++ b/arch/m68k/platform/coldfire/m5272.c | |||