commit cbfce1dba6ff2061bf48b683c5c7f391b68fa1c4
author Graeme Russ <graeme.russ@gmail.com> Wed Apr 13 19:43:28 2011 +1000
committer Graeme Russ <graeme.russ@gmail.com> Wed Apr 13 19:43:28 2011 +1000
tree 59399e99054261e245a1f2f2dbb478adad1d49ab
parent 45fc1d84645f80823c995e317b6fbe0ecca313a1

x86: Rename i386 to x86

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

include/common.h

diff --git a/include/common.h b/include/common.h
index 9ba1601..21c05db 100644
--- a/include/common.h
+++ b/include/common.h
@@ -272,9 +272,9 @@
 # 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

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index f3ef7d2..548d52c 100644
--- 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

include/exports.h

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