aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-04-13 19:43:28 +1000
committerGraeme Russ <graeme.russ@gmail.com>2011-04-13 19:43:28 +1000
commitfea25720013f84427a0ba8833a38614fcaf488ba (patch)
tree59399e99054261e245a1f2f2dbb478adad1d49ab /arch
parentdbf7115a326fa70ac3e4ca87497c7e21c6642b45 (diff)
downloadu-boot-linaro-stable-fea25720013f84427a0ba8833a38614fcaf488ba.tar.gz
x86: Rename i386 to x86
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/config.mk (renamed from arch/i386/config.mk)0
-rw-r--r--arch/x86/cpu/Makefile (renamed from arch/i386/cpu/Makefile)0
-rw-r--r--arch/x86/cpu/config.mk (renamed from arch/i386/cpu/config.mk)2
-rw-r--r--arch/x86/cpu/cpu.c (renamed from arch/i386/cpu/cpu.c)2
-rw-r--r--arch/x86/cpu/interrupts.c (renamed from arch/i386/cpu/interrupts.c)0
-rw-r--r--arch/x86/cpu/resetvec.S (renamed from arch/i386/cpu/resetvec.S)2
-rw-r--r--arch/x86/cpu/sc520/Makefile (renamed from arch/i386/cpu/sc520/Makefile)0
-rw-r--r--arch/x86/cpu/sc520/sc520.c (renamed from arch/i386/cpu/sc520/sc520.c)0
-rw-r--r--arch/x86/cpu/sc520/sc520_car.S (renamed from arch/i386/cpu/sc520/sc520_car.S)0
-rw-r--r--arch/x86/cpu/sc520/sc520_pci.c (renamed from arch/i386/cpu/sc520/sc520_pci.c)0
-rw-r--r--arch/x86/cpu/sc520/sc520_sdram.c (renamed from arch/i386/cpu/sc520/sc520_sdram.c)0
-rw-r--r--arch/x86/cpu/sc520/sc520_ssi.c (renamed from arch/i386/cpu/sc520/sc520_ssi.c)0
-rw-r--r--arch/x86/cpu/sc520/sc520_timer.c (renamed from arch/i386/cpu/sc520/sc520_timer.c)0
-rw-r--r--arch/x86/cpu/start.S (renamed from arch/i386/cpu/start.S)6
-rw-r--r--arch/x86/cpu/start16.S (renamed from arch/i386/cpu/start16.S)2
-rw-r--r--arch/x86/cpu/u-boot.lds (renamed from arch/i386/cpu/u-boot.lds)0
-rw-r--r--arch/x86/include/asm/bitops.h (renamed from arch/i386/include/asm/bitops.h)0
-rw-r--r--arch/x86/include/asm/bootparam.h (renamed from arch/i386/include/asm/bootparam.h)0
-rw-r--r--arch/x86/include/asm/byteorder.h (renamed from arch/i386/include/asm/byteorder.h)0
-rw-r--r--arch/x86/include/asm/config.h (renamed from arch/i386/include/asm/config.h)0
-rw-r--r--arch/x86/include/asm/e820.h (renamed from arch/i386/include/asm/e820.h)0
-rw-r--r--arch/x86/include/asm/errno.h (renamed from arch/i386/include/asm/errno.h)0
-rw-r--r--arch/x86/include/asm/global_data.h (renamed from arch/i386/include/asm/global_data.h)0
-rw-r--r--arch/x86/include/asm/i8254.h (renamed from arch/i386/include/asm/i8254.h)0
-rw-r--r--arch/x86/include/asm/i8259.h (renamed from arch/i386/include/asm/i8259.h)0
-rw-r--r--arch/x86/include/asm/ibmpc.h (renamed from arch/i386/include/asm/ibmpc.h)0
-rw-r--r--arch/x86/include/asm/ic/pci.h (renamed from arch/i386/include/asm/ic/pci.h)0
-rw-r--r--arch/x86/include/asm/ic/sc520.h (renamed from arch/i386/include/asm/ic/sc520.h)0
-rw-r--r--arch/x86/include/asm/ic/ssi.h (renamed from arch/i386/include/asm/ic/ssi.h)0
-rw-r--r--arch/x86/include/asm/interrupt.h (renamed from arch/i386/include/asm/interrupt.h)4
-rw-r--r--arch/x86/include/asm/io.h (renamed from arch/i386/include/asm/io.h)0
-rw-r--r--arch/x86/include/asm/ioctl.h (renamed from arch/i386/include/asm/ioctl.h)0
-rw-r--r--arch/x86/include/asm/ist.h (renamed from arch/i386/include/asm/ist.h)0
-rw-r--r--arch/x86/include/asm/pci.h (renamed from arch/i386/include/asm/pci.h)0
-rw-r--r--arch/x86/include/asm/posix_types.h (renamed from arch/i386/include/asm/posix_types.h)0
-rw-r--r--arch/x86/include/asm/processor-flags.h (renamed from arch/i386/include/asm/processor-flags.h)0
-rw-r--r--arch/x86/include/asm/processor.h (renamed from arch/i386/include/asm/processor.h)0
-rw-r--r--arch/x86/include/asm/ptrace.h (renamed from arch/i386/include/asm/ptrace.h)0
-rw-r--r--arch/x86/include/asm/realmode.h (renamed from arch/i386/include/asm/realmode.h)0
-rw-r--r--arch/x86/include/asm/string.h (renamed from arch/i386/include/asm/string.h)0
-rw-r--r--arch/x86/include/asm/types.h (renamed from arch/i386/include/asm/types.h)0
-rw-r--r--arch/x86/include/asm/u-boot-x86.h (renamed from arch/i386/include/asm/u-boot-i386.h)4
-rw-r--r--arch/x86/include/asm/u-boot.h (renamed from arch/i386/include/asm/u-boot.h)0
-rw-r--r--arch/x86/include/asm/unaligned.h (renamed from arch/i386/include/asm/unaligned.h)0
-rw-r--r--arch/x86/include/asm/video/edid.h (renamed from arch/i386/include/asm/video/edid.h)0
-rw-r--r--arch/x86/include/asm/zimage.h (renamed from arch/i386/include/asm/zimage.h)0
-rw-r--r--arch/x86/lib/Makefile (renamed from arch/i386/lib/Makefile)0
-rw-r--r--arch/x86/lib/bios.S (renamed from arch/i386/lib/bios.S)0
-rw-r--r--arch/x86/lib/bios.h (renamed from arch/i386/lib/bios.h)0
-rw-r--r--arch/x86/lib/bios_pci.S (renamed from arch/i386/lib/bios_pci.S)0
-rw-r--r--arch/x86/lib/bios_setup.c (renamed from arch/i386/lib/bios_setup.c)0
-rw-r--r--arch/x86/lib/board.c (renamed from arch/i386/lib/board.c)2
-rw-r--r--arch/x86/lib/bootm.c (renamed from arch/i386/lib/bootm.c)0
-rw-r--r--arch/x86/lib/interrupts.c (renamed from arch/i386/lib/interrupts.c)0
-rw-r--r--arch/x86/lib/pcat_interrupts.c (renamed from arch/i386/lib/pcat_interrupts.c)0
-rw-r--r--arch/x86/lib/pcat_timer.c (renamed from arch/i386/lib/pcat_timer.c)0
-rw-r--r--arch/x86/lib/pci.c (renamed from arch/i386/lib/pci.c)0
-rw-r--r--arch/x86/lib/pci_type1.c (renamed from arch/i386/lib/pci_type1.c)0
-rw-r--r--arch/x86/lib/realmode.c (renamed from arch/i386/lib/realmode.c)0
-rw-r--r--arch/x86/lib/realmode_switch.S (renamed from arch/i386/lib/realmode_switch.S)0
-rw-r--r--arch/x86/lib/timer.c (renamed from arch/i386/lib/timer.c)0
-rw-r--r--arch/x86/lib/video.c (renamed from arch/i386/lib/video.c)0
-rw-r--r--arch/x86/lib/video_bios.c (renamed from arch/i386/lib/video_bios.c)0
-rw-r--r--arch/x86/lib/zimage.c (renamed from arch/i386/lib/zimage.c)0
64 files changed, 12 insertions, 12 deletions
diff --git a/arch/i386/config.mk b/arch/x86/config.mk
index e9452012a..e9452012a 100644
--- a/arch/i386/config.mk
+++ b/arch/x86/config.mk
diff --git a/arch/i386/cpu/Makefile b/arch/x86/cpu/Makefile
index ddde83c91..ddde83c91 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 9b2e2c9fe..d1b528a43 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 5ca0c9156..0c5d7c3d5 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 62bcadc48..62bcadc48 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 27021bd72..c690d2516 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 54260b610..54260b610 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 edc1a5c0f..edc1a5c0f 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 a33f94f49..a33f94f49 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 8cd7ffecd..8cd7ffecd 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 f3623f53f..f3623f53f 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 ac58d2597..ac58d2597 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 1bcfe67c9..1bcfe67c9 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 2124a42c9..7ccc076fe 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 d2e5d136f..f1b9d0a0c 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 55974228b..55974228b 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 c7a38f237..c7a38f237 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 140095117..140095117 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 7dfeb8bbe..7dfeb8bbe 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 049c44eaf..049c44eaf 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 d155ce9ce..d155ce9ce 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 4c82b503d..4c82b503d 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 f8a16d646..f8a16d646 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 aafdfb806..aafdfb806 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 774d7a31e..774d7a31e 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 e35cbd887..e35cbd887 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 2e4376b9b..2e4376b9b 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 956c1c263..956c1c263 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 bd48eab16..bd48eab16 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 d32ef8b19..be52fe40d 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 9b757d489..9b757d489 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 b279fe06d..b279fe06d 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 7e5dff1de..7e5dff1de 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 050a2bb86..050a2bb86 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 5529f3270..5529f3270 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 7a3e836eb..7a3e836eb 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 22a129813..22a129813 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 a727dbfb0..a727dbfb0 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 9177e4ec0..9177e4ec0 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 3643a79fd..3643a79fd 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 9a40e383e..9a40e383e 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 7b39bd2ae..944e1a200 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 a43b3aade..a43b3aade 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 6cecbbb21..6cecbbb21 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 928c342b3..928c342b3 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 b6266e456..b6266e456 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 71e94f76f..71e94f76f 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 660a24439..660a24439 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 3c8d61a6f..3c8d61a6f 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 9e412e5e4..9e412e5e4 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 6949b3506..6949b3506 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 6d947c6c2..df5422221 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 a21a21f1f..a21a21f1f 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 a2c598f9a..a2c598f9a 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 364c43583..364c43583 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 1911c6c19..1911c6c19 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 e791e88bd..e791e88bd 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 8ce5b33e3..8ce5b33e3 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 5be827c66..5be827c66 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 fce4eccab..fce4eccab 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 8fc68cdcb..8fc68cdcb 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 b29075c49..b29075c49 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 6bc433574..6bc433574 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 cc4b40e64..cc4b40e64 100644
--- a/arch/i386/lib/zimage.c
+++ b/arch/x86/lib/zimage.c