x86: Rename i386 to x86

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>

diff --git a/MAKEALL b/MAKEALL
index e1b928fdb579484484cc933e91bd2e420bbfc840..6acece7cad8c24bad46bfcd645efcccf721fac45 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -544,10 +544,10 @@ LIST_mips_el="                    \
 "
 
 #########################################################################
-## i386 Systems
+## x86 Systems
 #########################################################################
 
-LIST_x86="$(boards_by_arch i386)"
+LIST_x86="$(boards_by_arch x86)"
 
 #########################################################################
 ## Nios-II Systems

diff --git a/Makefile b/Makefile
index 1d571347a2737504a00c2f9c31231da97b5d91b9..713dba1d5f34f5ff6516e02936d3e857fa062b9f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ TIMESTAMP_FILE = $(obj)include/timestamp_autogenerated.h
 VERSION_FILE = $(obj)include/version_autogenerated.h
 
 HOSTARCH := $(shell uname -m | \
-       sed -e s/i.86/i386/ \
+       sed -e s/i.86/x86/ \
            -e s/sun4u/sparc64/ \
            -e s/arm.*/arm/ \
            -e s/sa110/arm/ \
@@ -167,7 +167,7 @@ include $(TOPDIR)/config.mk
 # U-Boot objects....order is important (i.e. start must be first)
 
 OBJS  = $(CPUDIR)/start.o
-ifeq ($(CPU),i386)
+ifeq ($(CPU),x86)
 OBJS += $(CPUDIR)/start16.o
 OBJS += $(CPUDIR)/resetvec.o
 endif

diff --git a/README b/README
index c9fedd8011e227562b1dad777c139aa9a0c33dca..4917e264433b7a27e3360f9135b6e8c452347c08 100644 (file)
--- a/README
+++ b/README
@@ -164,7 +164,7 @@ Directory Hierarchy:
   /blackfin            Files generic to Analog Devices Blackfin architecture
     /cpu               CPU specific files
     /lib               Architecture specific library files
-  /i386                        Files generic to i386 architecture
+  /x86                 Files generic to x86 architecture
     /cpu               CPU specific files
     /lib               Architecture specific library files
   /m68k                        Files generic to m68k architecture

diff --git a/arch/i386/config.mk b/arch/x86/config.mk
similarity index 100%
rename from arch/i386/config.mk
rename to arch/x86/config.mk

diff --git a/arch/i386/cpu/Makefile b/arch/x86/cpu/Makefile
similarity index 100%
rename from arch/i386/cpu/Makefile
rename to arch/x86/cpu/Makefile

diff --git a/arch/i386/cpu/config.mk b/arch/x86/cpu/config.mk
similarity index 94%
rename from arch/i386/cpu/config.mk
rename to arch/x86/cpu/config.mk
index 9b2e2c9fe1191153045208b5dcb3ce7b024a1e60..d1b528a43797122908c730ef5a0a0309241158f9 100644 (file)
--- 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
similarity index 98%
rename from arch/i386/cpu/cpu.c
rename to arch/x86/cpu/cpu.c
index 5ca0c9156c8b300e476976caab01bdfda4d7c56c..0c5d7c3d53a437a3a8f7ead925fe9862ff52658b 100644 (file)
--- 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
similarity index 100%
rename from arch/i386/cpu/interrupts.c
rename to arch/x86/cpu/interrupts.c

diff --git a/arch/i386/cpu/resetvec.S b/arch/x86/cpu/resetvec.S
similarity index 97%
rename from arch/i386/cpu/resetvec.S
rename to arch/x86/cpu/resetvec.S
index 27021bd7213eed290bbdc3a2791df955c1717baf..c690d2516e7b1a2857643898577b06a29e149017 100644 (file)
--- 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
similarity index 100%
rename from arch/i386/cpu/sc520/Makefile
rename to arch/x86/cpu/sc520/Makefile

diff --git a/arch/i386/cpu/sc520/sc520.c b/arch/x86/cpu/sc520/sc520.c
similarity index 100%
rename from arch/i386/cpu/sc520/sc520.c
rename to arch/x86/cpu/sc520/sc520.c

diff --git a/arch/i386/cpu/sc520/sc520_car.S b/arch/x86/cpu/sc520/sc520_car.S
similarity index 100%
rename from arch/i386/cpu/sc520/sc520_car.S
rename to 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
similarity index 100%
rename from arch/i386/cpu/sc520/sc520_pci.c
rename to 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
similarity index 100%
rename from arch/i386/cpu/sc520/sc520_sdram.c
rename to 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
similarity index 100%
rename from arch/i386/cpu/sc520/sc520_ssi.c
rename to 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
similarity index 100%
rename from arch/i386/cpu/sc520/sc520_timer.c
rename to arch/x86/cpu/sc520/sc520_timer.c

diff --git a/arch/i386/cpu/start.S b/arch/x86/cpu/start.S
similarity index 97%
rename from arch/i386/cpu/start.S
rename to arch/x86/cpu/start.S
index 2124a42c9d765cf99115db3e968e405f85699a9a..7ccc076fec04b9f9cda074a11412ec645e1ed62a 100644 (file)
--- 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
similarity index 98%
rename from arch/i386/cpu/start16.S
rename to arch/x86/cpu/start16.S
index d2e5d136fab7b35594bf6720b718adf71570d0b2..f1b9d0a0c9719f0c9946bc4243c43802a529323d 100644 (file)
--- 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
similarity index 100%
rename from arch/i386/cpu/u-boot.lds
rename to arch/x86/cpu/u-boot.lds

diff --git a/arch/i386/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
similarity index 100%
rename from arch/i386/include/asm/bitops.h
rename to arch/x86/include/asm/bitops.h

diff --git a/arch/i386/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
similarity index 100%
rename from arch/i386/include/asm/bootparam.h
rename to arch/x86/include/asm/bootparam.h

diff --git a/arch/i386/include/asm/byteorder.h b/arch/x86/include/asm/byteorder.h
similarity index 100%
rename from arch/i386/include/asm/byteorder.h
rename to arch/x86/include/asm/byteorder.h

diff --git a/arch/i386/include/asm/config.h b/arch/x86/include/asm/config.h
similarity index 100%
rename from arch/i386/include/asm/config.h
rename to arch/x86/include/asm/config.h

diff --git a/arch/i386/include/asm/e820.h b/arch/x86/include/asm/e820.h
similarity index 100%
rename from arch/i386/include/asm/e820.h
rename to arch/x86/include/asm/e820.h

diff --git a/arch/i386/include/asm/errno.h b/arch/x86/include/asm/errno.h
similarity index 100%
rename from arch/i386/include/asm/errno.h
rename to arch/x86/include/asm/errno.h

diff --git a/arch/i386/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
similarity index 100%
rename from arch/i386/include/asm/global_data.h
rename to arch/x86/include/asm/global_data.h

diff --git a/arch/i386/include/asm/i8254.h b/arch/x86/include/asm/i8254.h
similarity index 100%
rename from arch/i386/include/asm/i8254.h
rename to arch/x86/include/asm/i8254.h

diff --git a/arch/i386/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
similarity index 100%
rename from arch/i386/include/asm/i8259.h
rename to arch/x86/include/asm/i8259.h

diff --git a/arch/i386/include/asm/ibmpc.h b/arch/x86/include/asm/ibmpc.h
similarity index 100%
rename from arch/i386/include/asm/ibmpc.h
rename to arch/x86/include/asm/ibmpc.h

diff --git a/arch/i386/include/asm/ic/pci.h b/arch/x86/include/asm/ic/pci.h
similarity index 100%
rename from arch/i386/include/asm/ic/pci.h
rename to 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
similarity index 100%
rename from arch/i386/include/asm/ic/sc520.h
rename to 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
similarity index 100%
rename from arch/i386/include/asm/ic/ssi.h
rename to arch/x86/include/asm/ic/ssi.h

diff --git a/arch/i386/include/asm/interrupt.h b/arch/x86/include/asm/interrupt.h
similarity index 95%
rename from arch/i386/include/asm/interrupt.h
rename to arch/x86/include/asm/interrupt.h
index d32ef8b190ef22c606e7fa951ef3cd21393dc780..be52fe40d0716f841b25892903124edeae466e19 100644 (file)
--- 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
similarity index 100%
rename from arch/i386/include/asm/io.h
rename to arch/x86/include/asm/io.h

diff --git a/arch/i386/include/asm/ioctl.h b/arch/x86/include/asm/ioctl.h
similarity index 100%
rename from arch/i386/include/asm/ioctl.h
rename to arch/x86/include/asm/ioctl.h

diff --git a/arch/i386/include/asm/ist.h b/arch/x86/include/asm/ist.h
similarity index 100%
rename from arch/i386/include/asm/ist.h
rename to arch/x86/include/asm/ist.h

diff --git a/arch/i386/include/asm/pci.h b/arch/x86/include/asm/pci.h
similarity index 100%
rename from arch/i386/include/asm/pci.h
rename to arch/x86/include/asm/pci.h

diff --git a/arch/i386/include/asm/posix_types.h b/arch/x86/include/asm/posix_types.h
similarity index 100%
rename from arch/i386/include/asm/posix_types.h
rename to 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
similarity index 100%
rename from arch/i386/include/asm/processor-flags.h
rename to arch/x86/include/asm/processor-flags.h

diff --git a/arch/i386/include/asm/processor.h b/arch/x86/include/asm/processor.h
similarity index 100%
rename from arch/i386/include/asm/processor.h
rename to arch/x86/include/asm/processor.h

diff --git a/arch/i386/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
similarity index 100%
rename from arch/i386/include/asm/ptrace.h
rename to arch/x86/include/asm/ptrace.h

diff --git a/arch/i386/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
similarity index 100%
rename from arch/i386/include/asm/realmode.h
rename to arch/x86/include/asm/realmode.h

diff --git a/arch/i386/include/asm/string.h b/arch/x86/include/asm/string.h
similarity index 100%
rename from arch/i386/include/asm/string.h
rename to arch/x86/include/asm/string.h

diff --git a/arch/i386/include/asm/types.h b/arch/x86/include/asm/types.h
similarity index 100%
rename from arch/i386/include/asm/types.h
rename to 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
similarity index 93%
rename from arch/i386/include/asm/u-boot-i386.h
rename to arch/x86/include/asm/u-boot-x86.h
index 7b39bd2ae01acd679a1ec11702819f1df4810606..944e1a20057a7b80c9e7757670e90aff5ea2691c 100644 (file)
--- 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
similarity index 100%
rename from arch/i386/include/asm/u-boot.h
rename to arch/x86/include/asm/u-boot.h

diff --git a/arch/i386/include/asm/unaligned.h b/arch/x86/include/asm/unaligned.h
similarity index 100%
rename from arch/i386/include/asm/unaligned.h
rename to arch/x86/include/asm/unaligned.h

diff --git a/arch/i386/include/asm/video/edid.h b/arch/x86/include/asm/video/edid.h
similarity index 100%
rename from arch/i386/include/asm/video/edid.h
rename to arch/x86/include/asm/video/edid.h

diff --git a/arch/i386/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
similarity index 100%
rename from arch/i386/include/asm/zimage.h
rename to arch/x86/include/asm/zimage.h

diff --git a/arch/i386/lib/Makefile b/arch/x86/lib/Makefile
similarity index 100%
rename from arch/i386/lib/Makefile
rename to arch/x86/lib/Makefile

diff --git a/arch/i386/lib/bios.S b/arch/x86/lib/bios.S
similarity index 100%
rename from arch/i386/lib/bios.S
rename to arch/x86/lib/bios.S

diff --git a/arch/i386/lib/bios.h b/arch/x86/lib/bios.h
similarity index 100%
rename from arch/i386/lib/bios.h
rename to arch/x86/lib/bios.h

diff --git a/arch/i386/lib/bios_pci.S b/arch/x86/lib/bios_pci.S
similarity index 100%
rename from arch/i386/lib/bios_pci.S
rename to arch/x86/lib/bios_pci.S

diff --git a/arch/i386/lib/bios_setup.c b/arch/x86/lib/bios_setup.c
similarity index 100%
rename from arch/i386/lib/bios_setup.c
rename to arch/x86/lib/bios_setup.c

diff --git a/arch/i386/lib/board.c b/arch/x86/lib/board.c
similarity index 99%
rename from arch/i386/lib/board.c
rename to arch/x86/lib/board.c
index 6d947c6c285338293e913841a54e3ca9b668d8a4..df54222211ad1ad098e36a27a9a2ced78006c1ad 100644 (file)
--- 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
similarity index 100%
rename from arch/i386/lib/bootm.c
rename to arch/x86/lib/bootm.c

diff --git a/arch/i386/lib/interrupts.c b/arch/x86/lib/interrupts.c
similarity index 100%
rename from arch/i386/lib/interrupts.c
rename to arch/x86/lib/interrupts.c

diff --git a/arch/i386/lib/pcat_interrupts.c b/arch/x86/lib/pcat_interrupts.c
similarity index 100%
rename from arch/i386/lib/pcat_interrupts.c
rename to arch/x86/lib/pcat_interrupts.c

diff --git a/arch/i386/lib/pcat_timer.c b/arch/x86/lib/pcat_timer.c
similarity index 100%
rename from arch/i386/lib/pcat_timer.c
rename to arch/x86/lib/pcat_timer.c

diff --git a/arch/i386/lib/pci.c b/arch/x86/lib/pci.c
similarity index 100%
rename from arch/i386/lib/pci.c
rename to arch/x86/lib/pci.c

diff --git a/arch/i386/lib/pci_type1.c b/arch/x86/lib/pci_type1.c
similarity index 100%
rename from arch/i386/lib/pci_type1.c
rename to arch/x86/lib/pci_type1.c

diff --git a/arch/i386/lib/realmode.c b/arch/x86/lib/realmode.c
similarity index 100%
rename from arch/i386/lib/realmode.c
rename to arch/x86/lib/realmode.c

diff --git a/arch/i386/lib/realmode_switch.S b/arch/x86/lib/realmode_switch.S
similarity index 100%
rename from arch/i386/lib/realmode_switch.S
rename to arch/x86/lib/realmode_switch.S

diff --git a/arch/i386/lib/timer.c b/arch/x86/lib/timer.c
similarity index 100%
rename from arch/i386/lib/timer.c
rename to arch/x86/lib/timer.c

diff --git a/arch/i386/lib/video.c b/arch/x86/lib/video.c
similarity index 100%
rename from arch/i386/lib/video.c
rename to arch/x86/lib/video.c

diff --git a/arch/i386/lib/video_bios.c b/arch/x86/lib/video_bios.c
similarity index 100%
rename from arch/i386/lib/video_bios.c
rename to arch/x86/lib/video_bios.c

diff --git a/arch/i386/lib/zimage.c b/arch/x86/lib/zimage.c
similarity index 100%
rename from arch/i386/lib/zimage.c
rename to arch/x86/lib/zimage.c

diff --git a/boards.cfg b/boards.cfg
index a45bd83a1556745e8443ab82ccbb6094566d952a..554e06c1211850f3803967254e5db032e7e6cc9c 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -205,8 +205,8 @@ ibf-dsp561                   blackfin    blackfin
 ip04                         blackfin    blackfin
 tcm-bf518                    blackfin    blackfin
 tcm-bf537                    blackfin    blackfin
-eNET                         i386        i386        eNET                -              sc520       eNET:SYS_TEXT_BASE=0x38040000
-eNET_SRAM                    i386        i386        eNET                -              sc520       eNET:SYS_TEXT_BASE=0x19000000
+eNET                         x86         x86        eNET                -              sc520       eNET:SYS_TEXT_BASE=0x38040000
+eNET_SRAM                    x86         x86        eNET                -              sc520       eNET:SYS_TEXT_BASE=0x19000000
 idmr                         m68k        mcf52x2
 TASREG                       m68k        mcf52x2     tasreg              esd
 M5208EVBE                    m68k        mcf52x2     m5208evbe           freescale

diff --git a/common/exports.c b/common/exports.c
index 3dff7351bc3d3a5204d4fde0cdeb5d16b28d4bc9..717e4afe6d877eca2f5c62e5bcd145cac97f9537 100644 (file)
--- a/common/exports.c
+++ b/common/exports.c
@@ -15,7 +15,7 @@ unsigned long get_version(void)
 /* Reuse _exports.h with a little trickery to avoid bitrot */
 #define EXPORT_FUNC(sym) gd->jt[XF_##sym] = (void *)sym;
 
-#if !defined(CONFIG_I386) && !defined(CONFIG_PPC)
+#if !defined(CONFIG_X86) && !defined(CONFIG_PPC)
 # define install_hdlr      dummy
 # define free_hdlr         dummy
 #else /* kludge for non-standard function naming */

diff --git a/doc/README-i386 b/doc/README-x86
similarity index 97%
rename from doc/README-i386
rename to doc/README-x86
index c560d22f462e200fd5554ecdd11f430a376d893d..e8c2fc907ec21c6d51943b72212abf838336687b 100644 (file)
--- a/doc/README-i386
+++ b/doc/README-x86
@@ -1,4 +1,4 @@
-This is my attempt to port U-Boot to the i386 platform. This
+This is my attempt to port U-Boot to the x86 platform. This
 work was sponsored by my emplyer, Omicron Ceti AB. http://www.omicron.se
 
 It is currently capable of booting a linux bzImage from flash on

diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c
index 2d2e7098b7b3cb701ea8de9460483afb66fa0230..507d38ceaf94b1d900f5c8e3e0b1ded5c47e907e 100644 (file)
--- a/examples/standalone/stubs.c
+++ b/examples/standalone/stubs.c
@@ -4,7 +4,7 @@
 #define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
 #endif /* GCC_VERSION */
 
-#if defined(CONFIG_I386)
+#if defined(CONFIG_X86)
 /*
  * x86 does not have a dedicated register to store the pointer to
  * the global_data. Thus the jump table address is stored in a
@@ -198,7 +198,7 @@ void app_startup(char * const *argv)
                *cp++ = 0;
        }
 
-#if defined(CONFIG_I386)
+#if defined(CONFIG_X86)
        /* x86 does not have a dedicated register for passing global_data */
        global_data = (gd_t *)argv[-1];
        jt = global_data->jt;

diff --git a/include/common.h b/include/common.h
index 9ba16012fe4ae08c1dca605ff8e0c58aa99d21ae..21c05db3f47e110e3e2e93f807399016bc1fda76 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -272,9 +272,9 @@ int setenv       (char *, char *);
 # include <asm/setup.h>
 # include <asm/u-boot-arm.h>   /* ARM version to be fixed! */
 #endif /* CONFIG_ARM */
-#ifdef CONFIG_I386             /* x86 version to be fixed! */
-# include <asm/u-boot-i386.h>
-#endif /* CONFIG_I386 */
+#ifdef CONFIG_X86              /* x86 version to be fixed! */
+# include <asm/u-boot-x86.h>
+#endif /* CONFIG_X86 */
 
 #ifdef CONFIG_AUTO_COMPLETE
 int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf);

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index f3ef7d2f92af626a5aa0f8c3e4d5ee39eaff679c..548d52c6a00fa2141412c2d5c490c16ab1a8c0dc 100644 (file)
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -33,7 +33,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_X86
 #define CONFIG_SYS_SC520
 #define CONFIG_SYS_SC520_SSI
 #define CONFIG_SHOW_BOOT_PROGRESS

diff --git a/include/exports.h b/include/exports.h
index 638231166277a65869b0af97b0d47d0d12fe2a11..ddd1bf494605d65f78224daa89684c56f62cf1c0 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -45,7 +45,7 @@ enum {
 
 #define XF_VERSION     6
 
-#if defined(CONFIG_I386)
+#if defined(CONFIG_X86)
 extern gd_t *global_data;
 #endif