64 files changed, 12 insertions, 12 deletions

diff --git a/arch/i386/config.mk b/arch/x86/config.mk
index e9452012a6..e9452012a6 100644
--- a/arch/i386/config.mk
+++ b/arch/x86/config.mk
diff --git a/arch/i386/cpu/Makefile b/arch/x86/cpu/Makefile
index ddde83c91d..ddde83c91d 100644
--- a/arch/i386/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
diff --git a/arch/i386/cpu/config.mk b/arch/x86/cpu/config.mk
index 9b2e2c9fe1..d1b528a437 100644
--- a/arch/i386/cpu/config.mk
+++ b/arch/x86/cpu/config.mk
@@ -23,7 +23,7 @@
 
 CROSS_COMPILE ?= i386-linux-
 
-PLATFORM_CPPFLAGS += -DCONFIG_I386 -D__I386__ -march=i386 -Werror
+PLATFORM_CPPFLAGS += -DCONFIG_X86 -D__I386__ -march=i386 -Werror
 
 # DO NOT MODIFY THE FOLLOWING UNLESS YOU REALLY KNOW WHAT YOU ARE DOING!
 LDPPFLAGS += -DRESET_SEG_START=0xffff0000
diff --git a/arch/i386/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 5ca0c9156c..0c5d7c3d53 100644
--- a/arch/i386/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -149,7 +149,7 @@ asm(".globl generate_gpf\n"
 
 void __reset_cpu(ulong addr)
 {
-	printf("Resetting using i386 Triple Fault\n");
+	printf("Resetting using x86 Triple Fault\n");
 	set_vector(13, generate_gpf);  /* general protection fault handler */
 	set_vector(8, generate_gpf);   /* double fault handler */
 	generate_gpf();                /* start the show */
diff --git a/arch/i386/cpu/interrupts.c b/arch/x86/cpu/interrupts.c
index 62bcadc486..62bcadc486 100644
--- a/arch/i386/cpu/interrupts.c
+++ b/arch/x86/cpu/interrupts.c
diff --git a/arch/i386/cpu/resetvec.S b/arch/x86/cpu/resetvec.S
index 27021bd721..c690d2516e 100644
--- a/arch/i386/cpu/resetvec.S
+++ b/arch/x86/cpu/resetvec.S
@@ -1,5 +1,5 @@
 /*
- *  U-boot - i386 Startup Code
+ *  U-boot - x86 Startup Code
  *
  * (C) Copyright 2002
  * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se>
diff --git a/arch/i386/cpu/sc520/Makefile b/arch/x86/cpu/sc520/Makefile
index 54260b6107..54260b6107 100644
--- a/arch/i386/cpu/sc520/Makefile
+++ b/arch/x86/cpu/sc520/Makefile
diff --git a/arch/i386/cpu/sc520/sc520.c b/arch/x86/cpu/sc520/sc520.c
index edc1a5c0f2..edc1a5c0f2 100644
--- a/arch/i386/cpu/sc520/sc520.c
+++ b/arch/x86/cpu/sc520/sc520.c
diff --git a/arch/i386/cpu/sc520/sc520_car.S b/arch/x86/cpu/sc520/sc520_car.S
index a33f94f491..a33f94f491 100644
--- a/arch/i386/cpu/sc520/sc520_car.S
+++ b/arch/x86/cpu/sc520/sc520_car.S
diff --git a/arch/i386/cpu/sc520/sc520_pci.c b/arch/x86/cpu/sc520/sc520_pci.c
index 8cd7ffecdb..8cd7ffecdb 100644
--- a/arch/i386/cpu/sc520/sc520_pci.c
+++ b/arch/x86/cpu/sc520/sc520_pci.c
diff --git a/arch/i386/cpu/sc520/sc520_sdram.c b/arch/x86/cpu/sc520/sc520_sdram.c
index f3623f53f2..f3623f53f2 100644
--- a/arch/i386/cpu/sc520/sc520_sdram.c
+++ b/arch/x86/cpu/sc520/sc520_sdram.c
diff --git a/arch/i386/cpu/sc520/sc520_ssi.c b/arch/x86/cpu/sc520/sc520_ssi.c
index ac58d25970..ac58d25970 100644
--- a/arch/i386/cpu/sc520/sc520_ssi.c
+++ b/arch/x86/cpu/sc520/sc520_ssi.c
diff --git a/arch/i386/cpu/sc520/sc520_timer.c b/arch/x86/cpu/sc520/sc520_timer.c
index 1bcfe67c94..1bcfe67c94 100644
--- a/arch/i386/cpu/sc520/sc520_timer.c
+++ b/arch/x86/cpu/sc520/sc520_timer.c
diff --git a/arch/i386/cpu/start.S b/arch/x86/cpu/start.S
index 2124a42c9d..7ccc076fec 100644
--- a/arch/i386/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -1,5 +1,5 @@
 /*
- *  U-boot - i386 Startup Code
+ *  U-boot - x86 Startup Code
  *
  * (C) Copyright 2008-2011
  * Graeme Russ, <graeme.russ@gmail.com>
@@ -35,8 +35,8 @@
 .code32
 .globl _start
 .type _start, @function
-.globl _i386boot_start
-_i386boot_start:
+.globl _x86boot_start
+_x86boot_start:
 	/*
 	 * This is the fail safe 32-bit bootstrap entry point. The
 	 * following code is not executed from a cold-reset (actually, a
diff --git a/arch/i386/cpu/start16.S b/arch/x86/cpu/start16.S
index d2e5d136fa..f1b9d0a0c9 100644
--- a/arch/i386/cpu/start16.S
+++ b/arch/x86/cpu/start16.S
@@ -1,5 +1,5 @@
 /*
- *  U-boot - i386 Startup Code
+ *  U-boot - x86 Startup Code
  *
  * (C) Copyright 2008-2011
  * Graeme Russ, <graeme.russ@gmail.com>
diff --git a/arch/i386/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds
index 55974228b5..55974228b5 100644
--- a/arch/i386/cpu/u-boot.lds
+++ b/arch/x86/cpu/u-boot.lds
diff --git a/arch/i386/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index c7a38f237a..c7a38f237a 100644
--- a/arch/i386/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
diff --git a/arch/i386/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index 140095117e..140095117e 100644
--- a/arch/i386/include/asm/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
diff --git a/arch/i386/include/asm/byteorder.h b/arch/x86/include/asm/byteorder.h
index 7dfeb8bbed..7dfeb8bbed 100644
--- a/arch/i386/include/asm/byteorder.h
+++ b/arch/x86/include/asm/byteorder.h
diff --git a/arch/i386/include/asm/config.h b/arch/x86/include/asm/config.h
index 049c44eaf8..049c44eaf8 100644
--- a/arch/i386/include/asm/config.h
+++ b/arch/x86/include/asm/config.h
diff --git a/arch/i386/include/asm/e820.h b/arch/x86/include/asm/e820.h
index d155ce9cee..d155ce9cee 100644
--- a/arch/i386/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
diff --git a/arch/i386/include/asm/errno.h b/arch/x86/include/asm/errno.h
index 4c82b503d9..4c82b503d9 100644
--- a/arch/i386/include/asm/errno.h
+++ b/arch/x86/include/asm/errno.h
diff --git a/arch/i386/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index f8a16d646f..f8a16d646f 100644
--- a/arch/i386/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
diff --git a/arch/i386/include/asm/i8254.h b/arch/x86/include/asm/i8254.h
index aafdfb8060..aafdfb8060 100644
--- a/arch/i386/include/asm/i8254.h
+++ b/arch/x86/include/asm/i8254.h
diff --git a/arch/i386/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
index 774d7a31e7..774d7a31e7 100644
--- a/arch/i386/include/asm/i8259.h
+++ b/arch/x86/include/asm/i8259.h
diff --git a/arch/i386/include/asm/ibmpc.h b/arch/x86/include/asm/ibmpc.h
index e35cbd887a..e35cbd887a 100644
--- a/arch/i386/include/asm/ibmpc.h
+++ b/arch/x86/include/asm/ibmpc.h
diff --git a/arch/i386/include/asm/ic/pci.h b/arch/x86/include/asm/ic/pci.h
index 2e4376b9b0..2e4376b9b0 100644
--- a/arch/i386/include/asm/ic/pci.h
+++ b/arch/x86/include/asm/ic/pci.h
diff --git a/arch/i386/include/asm/ic/sc520.h b/arch/x86/include/asm/ic/sc520.h
index 956c1c2636..956c1c2636 100644
--- a/arch/i386/include/asm/ic/sc520.h
+++ b/arch/x86/include/asm/ic/sc520.h
diff --git a/arch/i386/include/asm/ic/ssi.h b/arch/x86/include/asm/ic/ssi.h
index bd48eab161..bd48eab161 100644
--- a/arch/i386/include/asm/ic/ssi.h
+++ b/arch/x86/include/asm/ic/ssi.h
diff --git a/arch/i386/include/asm/interrupt.h b/arch/x86/include/asm/interrupt.h
index d32ef8b190..be52fe40d0 100644
--- a/arch/i386/include/asm/interrupt.h
+++ b/arch/x86/include/asm/interrupt.h
@@ -29,10 +29,10 @@
 
 #include <asm/types.h>
 
-/* arch/i386/cpu/interrupts.c */
+/* arch/x86/cpu/interrupts.c */
 void set_vector(u8 intnum, void *routine);
 
-/* arch/i386/lib/interupts.c */
+/* arch/x86/lib/interupts.c */
 void disable_irq(int irq);
 void enable_irq(int irq);
 
diff --git a/arch/i386/include/asm/io.h b/arch/x86/include/asm/io.h
index 9b757d489e..9b757d489e 100644
--- a/arch/i386/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
diff --git a/arch/i386/include/asm/ioctl.h b/arch/x86/include/asm/ioctl.h
index b279fe06df..b279fe06df 100644
--- a/arch/i386/include/asm/ioctl.h
+++ b/arch/x86/include/asm/ioctl.h
diff --git a/arch/i386/include/asm/ist.h b/arch/x86/include/asm/ist.h
index 7e5dff1de0..7e5dff1de0 100644
--- a/arch/i386/include/asm/ist.h
+++ b/arch/x86/include/asm/ist.h
diff --git a/arch/i386/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 050a2bb868..050a2bb868 100644
--- a/arch/i386/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
diff --git a/arch/i386/include/asm/posix_types.h b/arch/x86/include/asm/posix_types.h
index 5529f32702..5529f32702 100644
--- a/arch/i386/include/asm/posix_types.h
+++ b/arch/x86/include/asm/posix_types.h
diff --git a/arch/i386/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h
index 7a3e836eb2..7a3e836eb2 100644
--- a/arch/i386/include/asm/processor-flags.h
+++ b/arch/x86/include/asm/processor-flags.h
diff --git a/arch/i386/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 22a129813c..22a129813c 100644
--- a/arch/i386/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
diff --git a/arch/i386/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index a727dbfb05..a727dbfb05 100644
--- a/arch/i386/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
diff --git a/arch/i386/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
index 9177e4ec0d..9177e4ec0d 100644
--- a/arch/i386/include/asm/realmode.h
+++ b/arch/x86/include/asm/realmode.h
diff --git a/arch/i386/include/asm/string.h b/arch/x86/include/asm/string.h
index 3643a79fdf..3643a79fdf 100644
--- a/arch/i386/include/asm/string.h
+++ b/arch/x86/include/asm/string.h
diff --git a/arch/i386/include/asm/types.h b/arch/x86/include/asm/types.h
index 9a40e383eb..9a40e383eb 100644
--- a/arch/i386/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
diff --git a/arch/i386/include/asm/u-boot-i386.h b/arch/x86/include/asm/u-boot-x86.h
index 7b39bd2ae0..944e1a2005 100644
--- a/arch/i386/include/asm/u-boot-i386.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -35,7 +35,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 arch/i386/cpu/, arch/i386/lib/, or $(BOARD)/ */
+/* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or $(BOARD)/ */
 int timer_init(void);
 int dram_init_f(void);
 
@@ -51,7 +51,7 @@ void setup_pcat_compatibility(void);
 void isa_unmap_rom(u32 addr);
 u32 isa_map_rom(u32 bus_addr, int size);
 
-/* arch/i386/lib/... */
+/* arch/x86/lib/... */
 int video_bios_init(void);
 int video_init(void);
 
diff --git a/arch/i386/include/asm/u-boot.h b/arch/x86/include/asm/u-boot.h
index a43b3aaded..a43b3aaded 100644
--- a/arch/i386/include/asm/u-boot.h
+++ b/arch/x86/include/asm/u-boot.h
diff --git a/arch/i386/include/asm/unaligned.h b/arch/x86/include/asm/unaligned.h
index 6cecbbb211..6cecbbb211 100644
--- a/arch/i386/include/asm/unaligned.h
+++ b/arch/x86/include/asm/unaligned.h
diff --git a/arch/i386/include/asm/video/edid.h b/arch/x86/include/asm/video/edid.h
index 928c342b33..928c342b33 100644
--- a/arch/i386/include/asm/video/edid.h
+++ b/arch/x86/include/asm/video/edid.h
diff --git a/arch/i386/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
index b6266e456a..b6266e456a 100644
--- a/arch/i386/include/asm/zimage.h
+++ b/arch/x86/include/asm/zimage.h
diff --git a/arch/i386/lib/Makefile b/arch/x86/lib/Makefile
index 71e94f76f3..71e94f76f3 100644
--- a/arch/i386/lib/Makefile
+++ b/arch/x86/lib/Makefile
diff --git a/arch/i386/lib/bios.S b/arch/x86/lib/bios.S
index 660a244394..660a244394 100644
--- a/arch/i386/lib/bios.S
+++ b/arch/x86/lib/bios.S
diff --git a/arch/i386/lib/bios.h b/arch/x86/lib/bios.h
index 3c8d61a6f4..3c8d61a6f4 100644
--- a/arch/i386/lib/bios.h
+++ b/arch/x86/lib/bios.h
diff --git a/arch/i386/lib/bios_pci.S b/arch/x86/lib/bios_pci.S
index 9e412e5e4c..9e412e5e4c 100644
--- a/arch/i386/lib/bios_pci.S
+++ b/arch/x86/lib/bios_pci.S
diff --git a/arch/i386/lib/bios_setup.c b/arch/x86/lib/bios_setup.c
index 6949b35069..6949b35069 100644
--- a/arch/i386/lib/bios_setup.c
+++ b/arch/x86/lib/bios_setup.c
diff --git a/arch/i386/lib/board.c b/arch/x86/lib/board.c
index 6d947c6c28..df54222211 100644
--- a/arch/i386/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -41,7 +41,7 @@
 #include <net.h>
 #include <ide.h>
 #include <serial.h>
-#include <asm/u-boot-i386.h>
+#include <asm/u-boot-x86.h>
 #include <elf.h>
 
 #ifdef CONFIG_BITBANGMII
diff --git a/arch/i386/lib/bootm.c b/arch/x86/lib/bootm.c
index a21a21f1f7..a21a21f1f7 100644
--- a/arch/i386/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
diff --git a/arch/i386/lib/interrupts.c b/arch/x86/lib/interrupts.c
index a2c598f9a4..a2c598f9a4 100644
--- a/arch/i386/lib/interrupts.c
+++ b/arch/x86/lib/interrupts.c
diff --git a/arch/i386/lib/pcat_interrupts.c b/arch/x86/lib/pcat_interrupts.c
index 364c435837..364c435837 100644
--- a/arch/i386/lib/pcat_interrupts.c
+++ b/arch/x86/lib/pcat_interrupts.c
diff --git a/arch/i386/lib/pcat_timer.c b/arch/x86/lib/pcat_timer.c
index 1911c6c19d..1911c6c19d 100644
--- a/arch/i386/lib/pcat_timer.c
+++ b/arch/x86/lib/pcat_timer.c
diff --git a/arch/i386/lib/pci.c b/arch/x86/lib/pci.c
index e791e88bd4..e791e88bd4 100644
--- a/arch/i386/lib/pci.c
+++ b/arch/x86/lib/pci.c
diff --git a/arch/i386/lib/pci_type1.c b/arch/x86/lib/pci_type1.c
index 8ce5b33e3d..8ce5b33e3d 100644
--- a/arch/i386/lib/pci_type1.c
+++ b/arch/x86/lib/pci_type1.c
diff --git a/arch/i386/lib/realmode.c b/arch/x86/lib/realmode.c
index 5be827c66b..5be827c66b 100644
--- a/arch/i386/lib/realmode.c
+++ b/arch/x86/lib/realmode.c
diff --git a/arch/i386/lib/realmode_switch.S b/arch/x86/lib/realmode_switch.S
index fce4eccab0..fce4eccab0 100644
--- a/arch/i386/lib/realmode_switch.S
+++ b/arch/x86/lib/realmode_switch.S
diff --git a/arch/i386/lib/timer.c b/arch/x86/lib/timer.c
index 8fc68cdcb8..8fc68cdcb8 100644
--- a/arch/i386/lib/timer.c
+++ b/arch/x86/lib/timer.c
diff --git a/arch/i386/lib/video.c b/arch/x86/lib/video.c
index b29075c490..b29075c490 100644
--- a/arch/i386/lib/video.c
+++ b/arch/x86/lib/video.c
diff --git a/arch/i386/lib/video_bios.c b/arch/x86/lib/video_bios.c
index 6bc4335743..6bc4335743 100644
--- a/arch/i386/lib/video_bios.c
+++ b/arch/x86/lib/video_bios.c
diff --git a/arch/i386/lib/zimage.c b/arch/x86/lib/zimage.c
index cc4b40e64c..cc4b40e64c 100644
--- a/arch/i386/lib/zimage.c
+++ b/arch/x86/lib/zimage.c