diff --git a/cpu/leon2/Makefile b/arch/sparc/cpu/leon2/Makefile
similarity index 100%
rename from cpu/leon2/Makefile
rename to arch/sparc/cpu/leon2/Makefile
diff --git a/cpu/leon2/config.mk b/arch/sparc/cpu/leon2/config.mk
similarity index 100%
rename from cpu/leon2/config.mk
rename to arch/sparc/cpu/leon2/config.mk
diff --git a/cpu/leon2/cpu.c b/arch/sparc/cpu/leon2/cpu.c
similarity index 100%
rename from cpu/leon2/cpu.c
rename to arch/sparc/cpu/leon2/cpu.c
diff --git a/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c
similarity index 100%
rename from cpu/leon2/cpu_init.c
rename to arch/sparc/cpu/leon2/cpu_init.c
diff --git a/cpu/leon2/interrupts.c b/arch/sparc/cpu/leon2/interrupts.c
similarity index 100%
rename from cpu/leon2/interrupts.c
rename to arch/sparc/cpu/leon2/interrupts.c
diff --git a/cpu/leon2/prom.c b/arch/sparc/cpu/leon2/prom.c
similarity index 100%
rename from cpu/leon2/prom.c
rename to arch/sparc/cpu/leon2/prom.c
diff --git a/cpu/leon2/serial.c b/arch/sparc/cpu/leon2/serial.c
similarity index 100%
rename from cpu/leon2/serial.c
rename to arch/sparc/cpu/leon2/serial.c
diff --git a/cpu/leon2/start.S b/arch/sparc/cpu/leon2/start.S
similarity index 100%
rename from cpu/leon2/start.S
rename to arch/sparc/cpu/leon2/start.S
diff --git a/cpu/leon3/Makefile b/arch/sparc/cpu/leon3/Makefile
similarity index 100%
rename from cpu/leon3/Makefile
rename to arch/sparc/cpu/leon3/Makefile
diff --git a/cpu/leon3/ambapp.c b/arch/sparc/cpu/leon3/ambapp.c
similarity index 100%
rename from cpu/leon3/ambapp.c
rename to arch/sparc/cpu/leon3/ambapp.c
diff --git a/cpu/leon3/config.mk b/arch/sparc/cpu/leon3/config.mk
similarity index 100%
rename from cpu/leon3/config.mk
rename to arch/sparc/cpu/leon3/config.mk
diff --git a/cpu/leon3/cpu.c b/arch/sparc/cpu/leon3/cpu.c
similarity index 100%
rename from cpu/leon3/cpu.c
rename to arch/sparc/cpu/leon3/cpu.c
diff --git a/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c
similarity index 100%
rename from cpu/leon3/cpu_init.c
rename to arch/sparc/cpu/leon3/cpu_init.c
diff --git a/cpu/leon3/interrupts.c b/arch/sparc/cpu/leon3/interrupts.c
similarity index 100%
rename from cpu/leon3/interrupts.c
rename to arch/sparc/cpu/leon3/interrupts.c
diff --git a/cpu/leon3/prom.c b/arch/sparc/cpu/leon3/prom.c
similarity index 100%
rename from cpu/leon3/prom.c
rename to arch/sparc/cpu/leon3/prom.c
diff --git a/cpu/leon3/serial.c b/arch/sparc/cpu/leon3/serial.c
similarity index 100%
rename from cpu/leon3/serial.c
rename to arch/sparc/cpu/leon3/serial.c
diff --git a/cpu/leon3/start.S b/arch/sparc/cpu/leon3/start.S
similarity index 100%
rename from cpu/leon3/start.S
rename to arch/sparc/cpu/leon3/start.S
diff --git a/cpu/leon3/usb_uhci.c b/arch/sparc/cpu/leon3/usb_uhci.c
similarity index 100%
rename from cpu/leon3/usb_uhci.c
rename to arch/sparc/cpu/leon3/usb_uhci.c
diff --git a/cpu/leon3/usb_uhci.h b/arch/sparc/cpu/leon3/usb_uhci.h
similarity index 100%
rename from cpu/leon3/usb_uhci.h
rename to arch/sparc/cpu/leon3/usb_uhci.h
diff --git a/board/gaisler/gr_cpci_ax2000/u-boot.lds b/board/gaisler/gr_cpci_ax2000/u-boot.lds
index d5d7842157162296d276839aa01f804765de19a4..22826823cc327611b4568744e1bc278f156338a0 100644
--- a/board/gaisler/gr_cpci_ax2000/u-boot.lds
+++ b/board/gaisler/gr_cpci_ax2000/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon3/start.o (.text)
+		arch/sparc/cpu/leon3/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,
diff --git a/board/gaisler/gr_ep2s60/u-boot.lds b/board/gaisler/gr_ep2s60/u-boot.lds
index 99aa0addaf7c0a0e26d40fe6edbe6e41281c29c9..0ca2651703ee3e7f8de867bf44b48b79b6d8ccaa 100644
--- a/board/gaisler/gr_ep2s60/u-boot.lds
+++ b/board/gaisler/gr_ep2s60/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon3/start.o (.text)
+		arch/sparc/cpu/leon3/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,
diff --git a/board/gaisler/gr_xc3s_1500/u-boot.lds b/board/gaisler/gr_xc3s_1500/u-boot.lds
index 3b13190cb01f492ea64bb088540915976adf5c22..67222ac8e3045c8adbf4ab8db7869758edf395ac 100644
--- a/board/gaisler/gr_xc3s_1500/u-boot.lds
+++ b/board/gaisler/gr_xc3s_1500/u-boot.lds
@@ -60,7 +60,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon3/start.o (.text)
+		arch/sparc/cpu/leon3/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,
diff --git a/board/gaisler/grsim/u-boot.lds b/board/gaisler/grsim/u-boot.lds
index 0fa6627df5a945f54dfca5da868c6e1f600bdd98..681fd8d01b84f8268daea02e211972d428d8b549 100644
--- a/board/gaisler/grsim/u-boot.lds
+++ b/board/gaisler/grsim/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon3/start.o (.text)
+		arch/sparc/cpu/leon3/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,
diff --git a/board/gaisler/grsim_leon2/u-boot.lds b/board/gaisler/grsim_leon2/u-boot.lds
index c5311a6c1f578091bcddebec782c00270516971a..a12e7fb9ce35ae07dc968ab9636e695d75e0df75 100644
--- a/board/gaisler/grsim_leon2/u-boot.lds
+++ b/board/gaisler/grsim_leon2/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
 		_text = .;
 
 		*(.start)
-		cpu/leon2/start.o (.text)
+		arch/sparc/cpu/leon2/start.o (.text)
 /* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */
 		. = ALIGN(8192);
 /* PROM CODE, Will be relocated to the end of memory,