x86: Rename i386 to x86

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

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

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

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

arch/i386/cpu/config.mk → 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

arch/i386/cpu/cpu.c → 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 */

arch/i386/cpu/resetvec.S → 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>

arch/i386/cpu/start.S → 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

arch/i386/cpu/start16.S → 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>

arch/i386/include/asm/interrupt.h → 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);
 

arch/i386/include/asm/u-boot-i386.h → 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);
 

arch/i386/lib/board.c → 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

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

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 */

doc/README-i386 → 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

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;

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);

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

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