diff --git a/cpu/mcf5227x/Makefile b/arch/m68k/cpu/mcf5227x/Makefile
similarity index 100%
rename from cpu/mcf5227x/Makefile
rename to arch/m68k/cpu/mcf5227x/Makefile
diff --git a/cpu/mcf5227x/config.mk b/arch/m68k/cpu/mcf5227x/config.mk
similarity index 100%
rename from cpu/mcf5227x/config.mk
rename to arch/m68k/cpu/mcf5227x/config.mk
diff --git a/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
similarity index 100%
rename from cpu/mcf5227x/cpu.c
rename to arch/m68k/cpu/mcf5227x/cpu.c
diff --git a/cpu/mcf5227x/cpu_init.c b/arch/m68k/cpu/mcf5227x/cpu_init.c
similarity index 100%
rename from cpu/mcf5227x/cpu_init.c
rename to arch/m68k/cpu/mcf5227x/cpu_init.c
diff --git a/cpu/mcf5227x/interrupts.c b/arch/m68k/cpu/mcf5227x/interrupts.c
similarity index 100%
rename from cpu/mcf5227x/interrupts.c
rename to arch/m68k/cpu/mcf5227x/interrupts.c
diff --git a/cpu/mcf5227x/speed.c b/arch/m68k/cpu/mcf5227x/speed.c
similarity index 100%
rename from cpu/mcf5227x/speed.c
rename to arch/m68k/cpu/mcf5227x/speed.c
diff --git a/cpu/mcf5227x/start.S b/arch/m68k/cpu/mcf5227x/start.S
similarity index 100%
rename from cpu/mcf5227x/start.S
rename to arch/m68k/cpu/mcf5227x/start.S
diff --git a/cpu/mcf523x/Makefile b/arch/m68k/cpu/mcf523x/Makefile
similarity index 100%
rename from cpu/mcf523x/Makefile
rename to arch/m68k/cpu/mcf523x/Makefile
diff --git a/cpu/mcf523x/config.mk b/arch/m68k/cpu/mcf523x/config.mk
similarity index 100%
rename from cpu/mcf523x/config.mk
rename to arch/m68k/cpu/mcf523x/config.mk
diff --git a/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
similarity index 100%
rename from cpu/mcf523x/cpu.c
rename to arch/m68k/cpu/mcf523x/cpu.c
diff --git a/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c
similarity index 100%
rename from cpu/mcf523x/cpu_init.c
rename to arch/m68k/cpu/mcf523x/cpu_init.c
diff --git a/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c
similarity index 100%
rename from cpu/mcf523x/interrupts.c
rename to arch/m68k/cpu/mcf523x/interrupts.c
diff --git a/cpu/mcf523x/speed.c b/arch/m68k/cpu/mcf523x/speed.c
similarity index 100%
rename from cpu/mcf523x/speed.c
rename to arch/m68k/cpu/mcf523x/speed.c
diff --git a/cpu/mcf523x/start.S b/arch/m68k/cpu/mcf523x/start.S
similarity index 100%
rename from cpu/mcf523x/start.S
rename to arch/m68k/cpu/mcf523x/start.S
diff --git a/cpu/mcf52x2/Makefile b/arch/m68k/cpu/mcf52x2/Makefile
similarity index 100%
rename from cpu/mcf52x2/Makefile
rename to arch/m68k/cpu/mcf52x2/Makefile
diff --git a/cpu/mcf52x2/config.mk b/arch/m68k/cpu/mcf52x2/config.mk
similarity index 100%
rename from cpu/mcf52x2/config.mk
rename to arch/m68k/cpu/mcf52x2/config.mk
diff --git a/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
similarity index 100%
rename from cpu/mcf52x2/cpu.c
rename to arch/m68k/cpu/mcf52x2/cpu.c
diff --git a/cpu/mcf52x2/cpu.h b/arch/m68k/cpu/mcf52x2/cpu.h
similarity index 100%
rename from cpu/mcf52x2/cpu.h
rename to arch/m68k/cpu/mcf52x2/cpu.h
diff --git a/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c
similarity index 100%
rename from cpu/mcf52x2/cpu_init.c
rename to arch/m68k/cpu/mcf52x2/cpu_init.c
diff --git a/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c
similarity index 100%
rename from cpu/mcf52x2/interrupts.c
rename to arch/m68k/cpu/mcf52x2/interrupts.c
diff --git a/cpu/mcf52x2/speed.c b/arch/m68k/cpu/mcf52x2/speed.c
similarity index 100%
rename from cpu/mcf52x2/speed.c
rename to arch/m68k/cpu/mcf52x2/speed.c
diff --git a/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S
similarity index 100%
rename from cpu/mcf52x2/start.S
rename to arch/m68k/cpu/mcf52x2/start.S
diff --git a/cpu/mcf532x/Makefile b/arch/m68k/cpu/mcf532x/Makefile
similarity index 100%
rename from cpu/mcf532x/Makefile
rename to arch/m68k/cpu/mcf532x/Makefile
diff --git a/cpu/mcf532x/config.mk b/arch/m68k/cpu/mcf532x/config.mk
similarity index 100%
rename from cpu/mcf532x/config.mk
rename to arch/m68k/cpu/mcf532x/config.mk
diff --git a/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
similarity index 100%
rename from cpu/mcf532x/cpu.c
rename to arch/m68k/cpu/mcf532x/cpu.c
diff --git a/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
similarity index 100%
rename from cpu/mcf532x/cpu_init.c
rename to arch/m68k/cpu/mcf532x/cpu_init.c
diff --git a/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c
similarity index 100%
rename from cpu/mcf532x/interrupts.c
rename to arch/m68k/cpu/mcf532x/interrupts.c
diff --git a/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c
similarity index 100%
rename from cpu/mcf532x/speed.c
rename to arch/m68k/cpu/mcf532x/speed.c
diff --git a/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S
similarity index 100%
rename from cpu/mcf532x/start.S
rename to arch/m68k/cpu/mcf532x/start.S
diff --git a/cpu/mcf5445x/Makefile b/arch/m68k/cpu/mcf5445x/Makefile
similarity index 100%
rename from cpu/mcf5445x/Makefile
rename to arch/m68k/cpu/mcf5445x/Makefile
diff --git a/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk
similarity index 100%
rename from cpu/mcf5445x/config.mk
rename to arch/m68k/cpu/mcf5445x/config.mk
diff --git a/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
similarity index 100%
rename from cpu/mcf5445x/cpu.c
rename to arch/m68k/cpu/mcf5445x/cpu.c
diff --git a/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
similarity index 100%
rename from cpu/mcf5445x/cpu_init.c
rename to arch/m68k/cpu/mcf5445x/cpu_init.c
diff --git a/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c
similarity index 100%
rename from cpu/mcf5445x/interrupts.c
rename to arch/m68k/cpu/mcf5445x/interrupts.c
diff --git a/cpu/mcf5445x/pci.c b/arch/m68k/cpu/mcf5445x/pci.c
similarity index 100%
rename from cpu/mcf5445x/pci.c
rename to arch/m68k/cpu/mcf5445x/pci.c
diff --git a/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c
similarity index 100%
rename from cpu/mcf5445x/speed.c
rename to arch/m68k/cpu/mcf5445x/speed.c
diff --git a/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S
similarity index 100%
rename from cpu/mcf5445x/start.S
rename to arch/m68k/cpu/mcf5445x/start.S
diff --git a/cpu/mcf547x_8x/Makefile b/arch/m68k/cpu/mcf547x_8x/Makefile
similarity index 100%
rename from cpu/mcf547x_8x/Makefile
rename to arch/m68k/cpu/mcf547x_8x/Makefile
diff --git a/cpu/mcf547x_8x/config.mk b/arch/m68k/cpu/mcf547x_8x/config.mk
similarity index 100%
rename from cpu/mcf547x_8x/config.mk
rename to arch/m68k/cpu/mcf547x_8x/config.mk
diff --git a/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
similarity index 100%
rename from cpu/mcf547x_8x/cpu.c
rename to arch/m68k/cpu/mcf547x_8x/cpu.c
diff --git a/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
similarity index 100%
rename from cpu/mcf547x_8x/cpu_init.c
rename to arch/m68k/cpu/mcf547x_8x/cpu_init.c
diff --git a/cpu/mcf547x_8x/interrupts.c b/arch/m68k/cpu/mcf547x_8x/interrupts.c
similarity index 100%
rename from cpu/mcf547x_8x/interrupts.c
rename to arch/m68k/cpu/mcf547x_8x/interrupts.c
diff --git a/cpu/mcf547x_8x/pci.c b/arch/m68k/cpu/mcf547x_8x/pci.c
similarity index 100%
rename from cpu/mcf547x_8x/pci.c
rename to arch/m68k/cpu/mcf547x_8x/pci.c
diff --git a/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
similarity index 100%
rename from cpu/mcf547x_8x/slicetimer.c
rename to arch/m68k/cpu/mcf547x_8x/slicetimer.c
diff --git a/cpu/mcf547x_8x/speed.c b/arch/m68k/cpu/mcf547x_8x/speed.c
similarity index 100%
rename from cpu/mcf547x_8x/speed.c
rename to arch/m68k/cpu/mcf547x_8x/speed.c
diff --git a/cpu/mcf547x_8x/start.S b/arch/m68k/cpu/mcf547x_8x/start.S
similarity index 100%
rename from cpu/mcf547x_8x/start.S
rename to arch/m68k/cpu/mcf547x_8x/start.S
diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds
index b05eacf1aca6803aead3ad0fbd9c5ee9d8b48b1f..0fa633a1fe8e9f1bf926573e1b858d610e2f5282 100644
--- a/board/BuS/EB+MCF-EV123/u-boot.lds
+++ b/board/BuS/EB+MCF-EV123/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
common/dlmalloc.o (.text)
lib/string.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds
index 73e0310156e689ad9e7457110431427f5fbc56b4..167a0a3f129c9c38aa1b96aaaf8590625c69e35e 100644
--- a/board/astro/mcf5373l/u-boot.lds
+++ b/board/astro/mcf5373l/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf532x/start.o (.text)
+ arch/m68k/cpu/mcf532x/start.o (.text)
arch/m68k/lib/traps.o (.text)
arch/m68k/lib/interrupts.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index aacc0894d95dde1272f82fe982c28b2a6dfcebbd..ec0f5e9faa00ae0eff4cec47a0c3e26d90ca1b22 100644
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -54,10 +54,10 @@ SECTIONS
{
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
- cpu/mcf52x2/cpu_init.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/cpu_init.o (.text)
arch/m68k/lib/traps.o (.text)
- cpu/mcf52x2/interrupts.o (.text)
+ arch/m68k/cpu/mcf52x2/interrupts.o (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds
index f87d3cb725186496bd8f8459d86f27fde70fb485..d4fd705ce1eb4cafd6aff343d93a8aa8ccb6c66f 100644
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
arch/m68k/lib/traps.o (.text)
- cpu/mcf52x2/interrupts.o (.text)
+ arch/m68k/cpu/mcf52x2/interrupts.o (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/board/freescale/m5208evbe/u-boot.lds b/board/freescale/m5208evbe/u-boot.lds
index 3877527d873d2dda5ec252383c55e34c0732054d..507e21a03bbcee2f15327828528ebdc2a1843ca2 100644
--- a/board/freescale/m5208evbe/u-boot.lds
+++ b/board/freescale/m5208evbe/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
- cpu/mcf52x2/libmcf52x2.a (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/libmcf52x2.a (.text)
arch/m68k/lib/libm68k.a (.text)
common/dlmalloc.o (.text)
diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa
index 6d916d84fd837dc0eea25eba6ab92805cea5049c..4591196e68ed27323ef59c662100e6efa152e85b 100644
--- a/board/freescale/m52277evb/u-boot.spa
+++ b/board/freescale/m52277evb/u-boot.spa
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf5227x/start.o (.text)
- cpu/mcf5227x/libmcf5227x.a (.text)
+ arch/m68k/cpu/mcf5227x/start.o (.text)
+ arch/m68k/cpu/mcf5227x/libmcf5227x.a (.text)
arch/m68k/lib/libm68k.a (.text)
lib/libgeneric.a (.text)
common/cmd_mem.o (.text)
diff --git a/board/freescale/m52277evb/u-boot.stm b/board/freescale/m52277evb/u-boot.stm
index 03ff532964905cf147cefebd2d7a65f27ac74cae..1ec83e949056ac8e7329d0e0bdbfa0f85e7bb8ba 100644
--- a/board/freescale/m52277evb/u-boot.stm
+++ b/board/freescale/m52277evb/u-boot.stm
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf5227x/start.o (.text)
+ arch/m68k/cpu/mcf5227x/start.o (.text)
*(.text)
*(.fixup)
diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16
index 4e70efb2f4b79a1614e8d6e1a00e5f88c4a24a1d..d7bd10fd9658bfa922092db8c39249d2ab2b7043 100644
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf523x/start.o (.text)
- cpu/mcf523x/cpu_init.o (.text)
+ arch/m68k/cpu/mcf523x/start.o (.text)
+ arch/m68k/cpu/mcf523x/cpu_init.o (.text)
arch/m68k/lib/traps.o (.text)
arch/m68k/lib/interrupts.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32
index cbf2249255371cc9384a932efb6704b6a99ccb8d..45ff158905a842644f14583d1317e7070fac41c0 100644
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf523x/start.o (.text)
- cpu/mcf523x/cpu.o (.text)
- cpu/mcf523x/cpu_init.o (.text)
- cpu/mcf523x/interrupts.o (.text)
- cpu/mcf523x/speed.o (.text)
+ arch/m68k/cpu/mcf523x/start.o (.text)
+ arch/m68k/cpu/mcf523x/cpu.o (.text)
+ arch/m68k/cpu/mcf523x/cpu_init.o (.text)
+ arch/m68k/cpu/mcf523x/interrupts.o (.text)
+ arch/m68k/cpu/mcf523x/speed.o (.text)
arch/m68k/lib/libm68k.a (.text)
common/dlmalloc.o (.text)
common/cmd_bootm.o (.text)
diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds
index f87d3cb725186496bd8f8459d86f27fde70fb485..d4fd705ce1eb4cafd6aff343d93a8aa8ccb6c66f 100644
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
arch/m68k/lib/traps.o (.text)
- cpu/mcf52x2/interrupts.o (.text)
+ arch/m68k/cpu/mcf52x2/interrupts.o (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds
index 455e9b8fdd7862fd0c2bfdaba43eef232d81f918..4f8bb20d4540b12282feb64bca682ed2dab461f4 100644
--- a/board/freescale/m5253demo/u-boot.lds
+++ b/board/freescale/m5253demo/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
arch/m68k/lib/traps.o (.text)
- cpu/mcf52x2/interrupts.o (.text)
+ arch/m68k/cpu/mcf52x2/interrupts.o (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds
index 99c125cb9d411bbbd80c6d08bdad938fcbaf1e48..797c83785ce09f660043f650da8e3d6d3e02b95c 100644
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
arch/m68k/lib/traps.o (.text)
- cpu/mcf52x2/interrupts.o (.text)
+ arch/m68k/cpu/mcf52x2/interrupts.o (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds
index 588a1284711d73b88cbeae034d99c3b65141eba0..ca41232c6420e43d6863ef5e6d3f10dce4f90851 100644
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -56,9 +56,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
arch/m68k/lib/traps.o (.text)
- cpu/mcf52x2/interrupts.o (.text)
+ arch/m68k/cpu/mcf52x2/interrupts.o (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds
index aaba5a36825bea03a69a528ddf1ec68c9cf2635d..8b011df53278cf33bf736054dd2328daaf9fa443 100644
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
arch/m68k/lib/traps.o (.text)
- cpu/mcf52x2/interrupts.o (.text)
+ arch/m68k/cpu/mcf52x2/interrupts.o (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds
index 700b9f5098acaad34f7082cd3cac745c6a279dd8..cd17b0abf268055fdf26a4d13c19697e8f46664c 100644
--- a/board/freescale/m5275evb/u-boot.lds
+++ b/board/freescale/m5275evb/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
common/dlmalloc.o (.text)
lib/string.o (.text)
lib/zlib.o (.text)
diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds
index e936adff16fa99b94b0b54c42d822a8b865f5fd5..5ad0fad6845834b457d51670d33033c5f80fb4ee 100644
--- a/board/freescale/m5282evb/u-boot.lds
+++ b/board/freescale/m5282evb/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
common/dlmalloc.o (.text)
lib/string.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds
index a725da15ef40157f85b4d416153489d14cf2ba74..6577299c25e97f26261d1e77424d89e52bb7eab1 100644
--- a/board/freescale/m53017evb/u-boot.lds
+++ b/board/freescale/m53017evb/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf532x/start.o (.text)
- cpu/mcf532x/libmcf532x.a (.text)
+ arch/m68k/cpu/mcf532x/start.o (.text)
+ arch/m68k/cpu/mcf532x/libmcf532x.a (.text)
arch/m68k/lib/libm68k.a (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds
index bf4f1889c3132da35364dd340f44ddd3e723dd32..ba7ca2773371a141c1b33a06033c70e419bd1719 100644
--- a/board/freescale/m5329evb/u-boot.lds
+++ b/board/freescale/m5329evb/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf532x/start.o (.text)
+ arch/m68k/cpu/mcf532x/start.o (.text)
arch/m68k/lib/traps.o (.text)
arch/m68k/lib/interrupts.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds
index c129ac26801206388903455dbdc4ebd22f1a52c6..a2540bbc74ef0a5d21dc37c466fd9ba066655c98 100644
--- a/board/freescale/m5373evb/u-boot.lds
+++ b/board/freescale/m5373evb/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf532x/start.o (.text)
+ arch/m68k/cpu/mcf532x/start.o (.text)
arch/m68k/lib/traps.o (.text)
arch/m68k/lib/interrupts.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa
index e63b1f2e9dcfa88818aba0d40f4fdf678af7d0c2..09ac481dd1dee3ef383a6b22adb50f25a3790502 100644
--- a/board/freescale/m54451evb/u-boot.spa
+++ b/board/freescale/m54451evb/u-boot.spa
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf5445x/start.o (.text)
- cpu/mcf5445x/libmcf5445x.a (.text)
+ arch/m68k/cpu/mcf5445x/start.o (.text)
+ arch/m68k/cpu/mcf5445x/libmcf5445x.a (.text)
arch/m68k/lib/libm68k.a (.text)
common/cmd_flash.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm
index 7c3f0684c1b5cb8e0524270f2fc76f381457d0d0..e64a56c59bf2606108e5acd5cf23c71a2ecc4a2a 100644
--- a/board/freescale/m54451evb/u-boot.stm
+++ b/board/freescale/m54451evb/u-boot.stm
@@ -55,12 +55,12 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf5445x/start.o (.text)
-/* cpu/mcf5445x/cpu_init.o (.text)
- cpu/mcf5445x/cpu.o (.text)
- cpu/mcf5445x/dspi.o (.text)
- cpu/mcf5445x/interrupt.o (.text)
- cpu/mcf5445x/speed.o (.text)
+ arch/m68k/cpu/mcf5445x/start.o (.text)
+/* arch/m68k/cpu/mcf5445x/cpu_init.o (.text)
+ arch/m68k/cpu/mcf5445x/cpu.o (.text)
+ arch/m68k/cpu/mcf5445x/dspi.o (.text)
+ arch/m68k/cpu/mcf5445x/interrupt.o (.text)
+ arch/m68k/cpu/mcf5445x/speed.o (.text)
arch/m68k/lib/board.o (.text)
common/serial.o (.text)
common/console.o (.text)
diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm
index 2dd8a231891897d4d27108269c2b820d71bc96bd..ebf801ac71f44a1b5208278c6a1d6ad9730d1890 100644
--- a/board/freescale/m54455evb/u-boot.atm
+++ b/board/freescale/m54455evb/u-boot.atm
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf5445x/start.o (.text)
+ arch/m68k/cpu/mcf5445x/start.o (.text)
arch/m68k/lib/traps.o (.text)
arch/m68k/lib/interrupts.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int
index 8e54d7918266477e40b27af2f205c1b71bf5f04b..153556fe9b36d495527be7a7c66e750bea992f19 100644
--- a/board/freescale/m54455evb/u-boot.int
+++ b/board/freescale/m54455evb/u-boot.int
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf5445x/start.o (.text)
+ arch/m68k/cpu/mcf5445x/start.o (.text)
arch/m68k/lib/traps.o (.text)
arch/m68k/lib/interrupts.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/freescale/m54455evb/u-boot.stm b/board/freescale/m54455evb/u-boot.stm
index 3dd9a6b0477c60208011a9b1825dc820d44c056b..9cda1029d3ecd29d5e97de15eacaff3ca5e839e4 100644
--- a/board/freescale/m54455evb/u-boot.stm
+++ b/board/freescale/m54455evb/u-boot.stm
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf5445x/start.o (.text)
+ arch/m68k/cpu/mcf5445x/start.o (.text)
*(.text)
*(.fixup)
diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds
index 5f28a10baad3863c2b964b88c57279d79340a427..54bf2785aa2d251fa87a4a07f13048b1011bb4a7 100644
--- a/board/freescale/m547xevb/u-boot.lds
+++ b/board/freescale/m547xevb/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf547x_8x/start.o (.text)
+ arch/m68k/cpu/mcf547x_8x/start.o (.text)
arch/m68k/lib/traps.o (.text)
arch/m68k/lib/interrupts.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds
index 5f28a10baad3863c2b964b88c57279d79340a427..54bf2785aa2d251fa87a4a07f13048b1011bb4a7 100644
--- a/board/freescale/m548xevb/u-boot.lds
+++ b/board/freescale/m548xevb/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf547x_8x/start.o (.text)
+ arch/m68k/cpu/mcf547x_8x/start.o (.text)
arch/m68k/lib/traps.o (.text)
arch/m68k/lib/interrupts.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds
index 588a1284711d73b88cbeae034d99c3b65141eba0..ca41232c6420e43d6863ef5e6d3f10dce4f90851 100644
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -56,9 +56,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mcf52x2/start.o (.text)
+ arch/m68k/cpu/mcf52x2/start.o (.text)
arch/m68k/lib/traps.o (.text)
- cpu/mcf52x2/interrupts.o (.text)
+ arch/m68k/cpu/mcf52x2/interrupts.o (.text)
common/dlmalloc.o (.text)
lib/zlib.o (.text)
diff --git a/doc/README.m52277evb b/doc/README.m52277evb
index f30b45e1c9140c6b2d9153758d6360ccf16023cd..b6e955bcadb57c93801a0a41452aedac683d4395 100644
--- a/doc/README.m52277evb
+++ b/doc/README.m52277evb
@@ -14,13 +14,13 @@ Changed files:
- board/freescale/m52277evb/config.mk config make
- board/freescale/m52277evb/u-boot.lds Linker description
-- cpu/mcf5227x/cpu.c cpu specific code
-- cpu/mcf5227x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs
-- cpu/mcf5227x/interrupts.c cpu specific interrupt support
-- cpu/mcf5227x/speed.c system, flexbus, and cpu clock
-- cpu/mcf5227x/Makefile Makefile
-- cpu/mcf5227x/config.mk config make
-- cpu/mcf5227x/start.S start up assembly code
+- arch/m68k/cpu/mcf5227x/cpu.c cpu specific code
+- arch/m68k/cpu/mcf5227x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs
+- arch/m68k/cpu/mcf5227x/interrupts.c cpu specific interrupt support
+- arch/m68k/cpu/mcf5227x/speed.c system, flexbus, and cpu clock
+- arch/m68k/cpu/mcf5227x/Makefile Makefile
+- arch/m68k/cpu/mcf5227x/config.mk config make
+- arch/m68k/cpu/mcf5227x/start.S start up assembly code
- doc/README.m52277evb This readme file
diff --git a/doc/README.m53017evb b/doc/README.m53017evb
index 780a8038a53d6f1d4d7095700a34b010afef5956..42798c20009fb4cea7977389bc5d48a578ad1e75 100644
--- a/doc/README.m53017evb
+++ b/doc/README.m53017evb
@@ -15,13 +15,13 @@ Changed files:
- board/freescale/m53017evb/config.mk config make
- board/freescale/m53017evb/u-boot.lds Linker description
-- cpu/mcf532x/cpu.c cpu specific code
-- cpu/mcf532x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs
-- cpu/mcf532x/interrupts.c cpu specific interrupt support
-- cpu/mcf532x/speed.c system, flexbus, and cpu clock
-- cpu/mcf532x/Makefile Makefile
-- cpu/mcf532x/config.mk config make
-- cpu/mcf532x/start.S start up assembly code
+- arch/m68k/cpu/mcf532x/cpu.c cpu specific code
+- arch/m68k/cpu/mcf532x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs
+- arch/m68k/cpu/mcf532x/interrupts.c cpu specific interrupt support
+- arch/m68k/cpu/mcf532x/speed.c system, flexbus, and cpu clock
+- arch/m68k/cpu/mcf532x/Makefile Makefile
+- arch/m68k/cpu/mcf532x/config.mk config make
+- arch/m68k/cpu/mcf532x/start.S start up assembly code
- doc/README.m53017evb This readme file
diff --git a/doc/README.m5373evb b/doc/README.m5373evb
index 24a659b18e063ffb2ddc42da27848e8c4ce54581..e90a320ee57d66cf4b088f7a8e74602e5babefd7 100644
--- a/doc/README.m5373evb
+++ b/doc/README.m5373evb
@@ -15,13 +15,13 @@ Changed files:
- board/freescale/m5373evb/config.mk config make
- board/freescale/m5373evb/u-boot.lds Linker description
-- cpu/mcf532x/cpu.c cpu specific code
-- cpu/mcf532x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs
-- cpu/mcf532x/interrupts.c cpu specific interrupt support
-- cpu/mcf532x/speed.c system, pci, flexbus, and cpu clock
-- cpu/mcf532x/Makefile Makefile
-- cpu/mcf532x/config.mk config make
-- cpu/mcf532x/start.S start up assembly code
+- arch/m68k/cpu/mcf532x/cpu.c cpu specific code
+- arch/m68k/cpu/mcf532x/cpu_init.c FBCS, Mux pins, icache and RTC extra regs
+- arch/m68k/cpu/mcf532x/interrupts.c cpu specific interrupt support
+- arch/m68k/cpu/mcf532x/speed.c system, pci, flexbus, and cpu clock
+- arch/m68k/cpu/mcf532x/Makefile Makefile
+- arch/m68k/cpu/mcf532x/config.mk config make
+- arch/m68k/cpu/mcf532x/start.S start up assembly code
- doc/README.m5373evb This readme file
diff --git a/doc/README.m54455evb b/doc/README.m54455evb
index 257bcd5a1fea80e14be114ed3b0a48a772f05c86..918a746eb888ecbefc41fee4405c725b58f57c7f 100644
--- a/doc/README.m54455evb
+++ b/doc/README.m54455evb
@@ -18,13 +18,13 @@ Changed files:
- common/cmd_bdinfo.c Clock frequencies output
- common/cmd_mii.c mii support
-- cpu/mcf5445x/cpu.c cpu specific code
-- cpu/mcf5445x/cpu_init.c Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs
-- cpu/mcf5445x/interrupts.c cpu specific interrupt support
-- cpu/mcf5445x/speed.c system, pci, flexbus, and cpu clock
-- cpu/mcf5445x/Makefile Makefile
-- cpu/mcf5445x/config.mk config make
-- cpu/mcf5445x/start.S start up assembly code
+- arch/m68k/cpu/mcf5445x/cpu.c cpu specific code
+- arch/m68k/cpu/mcf5445x/cpu_init.c Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs
+- arch/m68k/cpu/mcf5445x/interrupts.c cpu specific interrupt support
+- arch/m68k/cpu/mcf5445x/speed.c system, pci, flexbus, and cpu clock
+- arch/m68k/cpu/mcf5445x/Makefile Makefile
+- arch/m68k/cpu/mcf5445x/config.mk config make
+- arch/m68k/cpu/mcf5445x/start.S start up assembly code
- doc/README.m54455evb This readme file
diff --git a/doc/README.m5475evb b/doc/README.m5475evb
index b61dfba3cdd86d3fa6579214db1c3f17cb03a27f..f5658ea486b39f189fb77fff3713a356e542c327 100644
--- a/doc/README.m5475evb
+++ b/doc/README.m5475evb
@@ -15,14 +15,14 @@ Changed files:
- board/freescale/m547xevb/config.mk config make
- board/freescale/m547xevb/u-boot.lds Linker description
-- cpu/mcf547x_8x/cpu.c cpu specific code
-- cpu/mcf547x_8x/cpu_init.c Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs
-- cpu/mcf547x_8x/interrupts.c cpu specific interrupt support
-- cpu/mcf547x_8x/slicetimer.c Timer support
-- cpu/mcf547x_8x/speed.c system, pci, flexbus, and cpu clock
-- cpu/mcf547x_8x/Makefile Makefile
-- cpu/mcf547x_8x/config.mk config make
-- cpu/mcf547x_8x/start.S start up assembly code
+- arch/m68k/cpu/mcf547x_8x/cpu.c cpu specific code
+- arch/m68k/cpu/mcf547x_8x/cpu_init.c Flexbus ChipSelect, Mux pins setup, icache and RTC extra regs
+- arch/m68k/cpu/mcf547x_8x/interrupts.c cpu specific interrupt support
+- arch/m68k/cpu/mcf547x_8x/slicetimer.c Timer support
+- arch/m68k/cpu/mcf547x_8x/speed.c system, pci, flexbus, and cpu clock
+- arch/m68k/cpu/mcf547x_8x/Makefile Makefile
+- arch/m68k/cpu/mcf547x_8x/config.mk config make
+- arch/m68k/cpu/mcf547x_8x/start.S start up assembly code
- doc/README.m5475evb This readme file
diff --git a/doc/README.m68k b/doc/README.m68k
index e6c33a7d960c3c70d593a95207c477fdc5caeffa..a00ab69b6f8bdc12402a0fd42f36a917913fdfb2 100644
--- a/doc/README.m68k
+++ b/doc/README.m68k
@@ -31,12 +31,12 @@ hopefully added soon!
2.1 Motorola Coldfire MCF5272
-----------------------------
-CPU specific code is located in: cpu/mcf52x2
+CPU specific code is located in: arch/m68k/cpu/mcf52x2
2.1 Motorola Coldfire MCF5282
-----------------------------
-CPU specific code is located in: cpu/mcf52x2
+CPU specific code is located in: arch/m68k/cpu/mcf52x2
The MCF5282 Port no longer needs a preloader and can place in external or
internal FLASH.