[U-Boot] [PATCH 17/17] i386: Move appropriate cpu/ dirs to arch/i386/cpu/

[Peter Tyser]

Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
---
 {cpu => arch/i386/cpu}/i386/Makefile            |    0
 {cpu => arch/i386/cpu}/i386/config.mk           |    0
 {cpu => arch/i386/cpu}/i386/cpu.c               |    0
 {cpu => arch/i386/cpu}/i386/interrupts.c        |    0
 {cpu => arch/i386/cpu}/i386/resetvec.S          |    0
 {cpu => arch/i386/cpu}/i386/sc520/Makefile      |    0
 {cpu => arch/i386/cpu}/i386/sc520/sc520.c       |    0
 {cpu => arch/i386/cpu}/i386/sc520/sc520_asm.S   |    0
 {cpu => arch/i386/cpu}/i386/sc520/sc520_pci.c   |    0
 {cpu => arch/i386/cpu}/i386/sc520/sc520_ssi.c   |    0
 {cpu => arch/i386/cpu}/i386/sc520/sc520_timer.c |    0
 {cpu => arch/i386/cpu}/i386/serial.c            |    0
 {cpu => arch/i386/cpu}/i386/start.S             |    0
 {cpu => arch/i386/cpu}/i386/start16.S           |    0
 arch/i386/include/asm/interrupt.h               |    2 +-
 arch/i386/include/asm/u-boot-i386.h             |    2 +-
 doc/TODO-i386                                   |    4 ++--
 17 files changed, 4 insertions(+), 4 deletions(-)
 rename {cpu => arch/i386/cpu}/i386/Makefile (100%)
 rename {cpu => arch/i386/cpu}/i386/config.mk (100%)
 rename {cpu => arch/i386/cpu}/i386/cpu.c (100%)
 rename {cpu => arch/i386/cpu}/i386/interrupts.c (100%)
 rename {cpu => arch/i386/cpu}/i386/resetvec.S (100%)
 rename {cpu => arch/i386/cpu}/i386/sc520/Makefile (100%)
 rename {cpu => arch/i386/cpu}/i386/sc520/sc520.c (100%)
 rename {cpu => arch/i386/cpu}/i386/sc520/sc520_asm.S (100%)
 rename {cpu => arch/i386/cpu}/i386/sc520/sc520_pci.c (100%)
 rename {cpu => arch/i386/cpu}/i386/sc520/sc520_ssi.c (100%)
 rename {cpu => arch/i386/cpu}/i386/sc520/sc520_timer.c (100%)
 rename {cpu => arch/i386/cpu}/i386/serial.c (100%)
 rename {cpu => arch/i386/cpu}/i386/start.S (100%)
 rename {cpu => arch/i386/cpu}/i386/start16.S (100%)

diff --git a/cpu/i386/Makefile b/arch/i386/cpu/i386/Makefile
similarity index 100%
rename from cpu/i386/Makefile
rename to arch/i386/cpu/i386/Makefile
diff --git a/cpu/i386/config.mk b/arch/i386/cpu/i386/config.mk
similarity index 100%
rename from cpu/i386/config.mk
rename to arch/i386/cpu/i386/config.mk
diff --git a/cpu/i386/cpu.c b/arch/i386/cpu/i386/cpu.c
similarity index 100%
rename from cpu/i386/cpu.c
rename to arch/i386/cpu/i386/cpu.c
diff --git a/cpu/i386/interrupts.c b/arch/i386/cpu/i386/interrupts.c
similarity index 100%
rename from cpu/i386/interrupts.c
rename to arch/i386/cpu/i386/interrupts.c
diff --git a/cpu/i386/resetvec.S b/arch/i386/cpu/i386/resetvec.S
similarity index 100%
rename from cpu/i386/resetvec.S
rename to arch/i386/cpu/i386/resetvec.S
diff --git a/cpu/i386/sc520/Makefile b/arch/i386/cpu/i386/sc520/Makefile
similarity index 100%
rename from cpu/i386/sc520/Makefile
rename to arch/i386/cpu/i386/sc520/Makefile
diff --git a/cpu/i386/sc520/sc520.c b/arch/i386/cpu/i386/sc520/sc520.c
similarity index 100%
rename from cpu/i386/sc520/sc520.c
rename to arch/i386/cpu/i386/sc520/sc520.c
diff --git a/cpu/i386/sc520/sc520_asm.S b/arch/i386/cpu/i386/sc520/sc520_asm.S
similarity index 100%
rename from cpu/i386/sc520/sc520_asm.S
rename to arch/i386/cpu/i386/sc520/sc520_asm.S
diff --git a/cpu/i386/sc520/sc520_pci.c b/arch/i386/cpu/i386/sc520/sc520_pci.c
similarity index 100%
rename from cpu/i386/sc520/sc520_pci.c
rename to arch/i386/cpu/i386/sc520/sc520_pci.c
diff --git a/cpu/i386/sc520/sc520_ssi.c b/arch/i386/cpu/i386/sc520/sc520_ssi.c
similarity index 100%
rename from cpu/i386/sc520/sc520_ssi.c
rename to arch/i386/cpu/i386/sc520/sc520_ssi.c
diff --git a/cpu/i386/sc520/sc520_timer.c b/arch/i386/cpu/i386/sc520/sc520_timer.c
similarity index 100%
rename from cpu/i386/sc520/sc520_timer.c
rename to arch/i386/cpu/i386/sc520/sc520_timer.c
diff --git a/cpu/i386/serial.c b/arch/i386/cpu/i386/serial.c
similarity index 100%
rename from cpu/i386/serial.c
rename to arch/i386/cpu/i386/serial.c
diff --git a/cpu/i386/start.S b/arch/i386/cpu/i386/start.S
similarity index 100%
rename from cpu/i386/start.S
rename to arch/i386/cpu/i386/start.S
diff --git a/cpu/i386/start16.S b/arch/i386/cpu/i386/start16.S
similarity index 100%
rename from cpu/i386/start16.S
rename to arch/i386/cpu/i386/start16.S
diff --git a/arch/i386/include/asm/interrupt.h b/arch/i386/include/asm/interrupt.h
index 8d324d9..1c47203 100644
--- a/arch/i386/include/asm/interrupt.h
+++ b/arch/i386/include/asm/interrupt.h
@@ -27,7 +27,7 @@
 #ifndef __ASM_INTERRUPT_H_
 #define __ASM_INTERRUPT_H_ 1
 
-/* cpu/i386/interrupts.c */
+/* arch/i386/cpu/i386/interrupts.c */
 void set_vector(u8 intnum, void *routine);
 
 /* arch/i386/lib/interupts.c */
diff --git a/arch/i386/include/asm/u-boot-i386.h b/arch/i386/include/asm/u-boot-i386.h
index a08632d..86f344e 100644
--- a/arch/i386/include/asm/u-boot-i386.h
+++ b/arch/i386/include/asm/u-boot-i386.h
@@ -33,7 +33,7 @@ void timer_isr(void *);
 typedef void (timer_fnc_t) (void);
 int register_timer_isr (timer_fnc_t *isr_func);
 
-/* Architecture specific - can be in cpu/i386/, arch/i386/lib/, or $(BOARD)/ */
+/* Arch-specific - can be in arch/i386/[cpu/i386/|i386/lib/], or $(BOARD) */
 int timer_init(void);
 
 /* cpu/.../interrupts.c */
diff --git a/doc/TODO-i386 b/doc/TODO-i386
index 2261f4a..d0d8052 100644
--- a/doc/TODO-i386
+++ b/doc/TODO-i386
@@ -4,11 +4,11 @@ i386 port missing features:
 * setup the BIOS data area and BIOS equipment word to reflect machine config. 
 * Make reset work (from Linux and from the boot prompt)
 * DMA, FDC, RTC, KBC initialization
-* split of part of cpu/i386/interrupt.c to cpu/i385/entry.c?
+* split of part of arch/i386/cpu/i386/interrupt.c to cpu/i385/entry.c?
 * re-entry of protected mode from real mode, should be added to realmode_switch.S 
   (and used by INT 10h and INT 16h handlers for console I/O during early
    linux boot...) 
-* missing functions in arch/i386/lib and cpu/i386
+* missing functions in arch/i386/lib and arch/i386/cpu/i386
 * speaker beep interface
 
 
-- 
1.6.2-rc2.GIT