m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds
index b05eacf..0fa633a 100644
--- a/board/BuS/EB+MCF-EV123/u-boot.lds
+++ b/board/BuS/EB+MCF-EV123/u-boot.lds
@@ -55,7 +55,7 @@
/* 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 73e0310..167a0a3 100644
--- a/board/astro/mcf5373l/u-boot.lds
+++ b/board/astro/mcf5373l/u-boot.lds
@@ -55,7 +55,7 @@
/* 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 aacc089..ec0f5e9 100644
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -54,10 +54,10 @@
{
/* 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 f87d3cb..d4fd705 100644
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -55,9 +55,9 @@
/* 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 3877527..507e21a 100644
--- a/board/freescale/m5208evbe/u-boot.lds
+++ b/board/freescale/m5208evbe/u-boot.lds
@@ -55,8 +55,8 @@
/* 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 6d916d8..4591196 100644
--- a/board/freescale/m52277evb/u-boot.spa
+++ b/board/freescale/m52277evb/u-boot.spa
@@ -55,8 +55,8 @@
/* 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 03ff532..1ec83e9 100644
--- a/board/freescale/m52277evb/u-boot.stm
+++ b/board/freescale/m52277evb/u-boot.stm
@@ -55,7 +55,7 @@
/* 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 4e70efb..d7bd10f 100644
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -55,8 +55,8 @@
/* 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 cbf2249..45ff158 100644
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -55,11 +55,11 @@
/* 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 f87d3cb..d4fd705 100644
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -55,9 +55,9 @@
/* 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 455e9b8..4f8bb20 100644
--- a/board/freescale/m5253demo/u-boot.lds
+++ b/board/freescale/m5253demo/u-boot.lds
@@ -55,9 +55,9 @@
/* 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 99c125c..797c837 100644
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -55,9 +55,9 @@
/* 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 588a128..ca41232 100644
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -56,9 +56,9 @@
/* 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 aaba5a3..8b011df 100644
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -55,9 +55,9 @@
/* 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 700b9f5..cd17b0a 100644
--- a/board/freescale/m5275evb/u-boot.lds
+++ b/board/freescale/m5275evb/u-boot.lds
@@ -55,7 +55,7 @@
/* 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 e936adf..5ad0fad 100644
--- a/board/freescale/m5282evb/u-boot.lds
+++ b/board/freescale/m5282evb/u-boot.lds
@@ -55,7 +55,7 @@
/* 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 a725da1..6577299 100644
--- a/board/freescale/m53017evb/u-boot.lds
+++ b/board/freescale/m53017evb/u-boot.lds
@@ -55,8 +55,8 @@
/* 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 bf4f188..ba7ca27 100644
--- a/board/freescale/m5329evb/u-boot.lds
+++ b/board/freescale/m5329evb/u-boot.lds
@@ -55,7 +55,7 @@
/* 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 c129ac2..a2540bb 100644
--- a/board/freescale/m5373evb/u-boot.lds
+++ b/board/freescale/m5373evb/u-boot.lds
@@ -55,7 +55,7 @@
/* 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 e63b1f2..09ac481 100644
--- a/board/freescale/m54451evb/u-boot.spa
+++ b/board/freescale/m54451evb/u-boot.spa
@@ -55,8 +55,8 @@
/* 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 7c3f068..e64a56c 100644
--- a/board/freescale/m54451evb/u-boot.stm
+++ b/board/freescale/m54451evb/u-boot.stm
@@ -55,12 +55,12 @@
/* 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 2dd8a23..ebf801a 100644
--- a/board/freescale/m54455evb/u-boot.atm
+++ b/board/freescale/m54455evb/u-boot.atm
@@ -55,7 +55,7 @@
/* 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 8e54d79..153556f 100644
--- a/board/freescale/m54455evb/u-boot.int
+++ b/board/freescale/m54455evb/u-boot.int
@@ -55,7 +55,7 @@
/* 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 3dd9a6b..9cda102 100644
--- a/board/freescale/m54455evb/u-boot.stm
+++ b/board/freescale/m54455evb/u-boot.stm
@@ -55,7 +55,7 @@
/* 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 5f28a10..54bf278 100644
--- a/board/freescale/m547xevb/u-boot.lds
+++ b/board/freescale/m547xevb/u-boot.lds
@@ -55,7 +55,7 @@
/* 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 5f28a10..54bf278 100644
--- a/board/freescale/m548xevb/u-boot.lds
+++ b/board/freescale/m548xevb/u-boot.lds
@@ -55,7 +55,7 @@
/* 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 588a128..ca41232 100644
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -56,9 +56,9 @@
/* 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)