20 files changed, 4 insertions, 4 deletions
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
index 7d74cf997b..5ae888bc41 100644
--- a/payloads/libpayload/Makefile.inc
+++ b/payloads/libpayload/Makefile.inc
@@ -31,7 +31,7 @@
 
 export KERNELVERSION      := 0.2.0
 
-ARCHDIR-$(CONFIG_ARCH_X86)       := i386
+ARCHDIR-$(CONFIG_ARCH_X86)       := x86
 ARCHDIR-$(CONFIG_TARGET_POWERPC) := powerpc
 DESTDIR ?= install
 
diff --git a/payloads/libpayload/arch/Config.in b/payloads/libpayload/arch/Config.in
index 6734f5a49e..690b12adf5 100644
--- a/payloads/libpayload/arch/Config.in
+++ b/payloads/libpayload/arch/Config.in
@@ -20,5 +20,5 @@
 ## MA 02111-1307 USA
 ##
 
-source "arch/i386/Config.in"
+source "arch/x86/Config.in"
 source "arch/powerpc/Config.in"
diff --git a/payloads/libpayload/arch/i386/Config.in b/payloads/libpayload/arch/x86/Config.in
index 242d8b1e08..242d8b1e08 100644
--- a/payloads/libpayload/arch/i386/Config.in
+++ b/payloads/libpayload/arch/x86/Config.in
diff --git a/payloads/libpayload/arch/i386/Makefile.inc b/payloads/libpayload/arch/x86/Makefile.inc
index 8f68b07709..8f68b07709 100644
--- a/payloads/libpayload/arch/i386/Makefile.inc
+++ b/payloads/libpayload/arch/x86/Makefile.inc
diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/x86/coreboot.c
index d39af4ab5d..d39af4ab5d 100644
--- a/payloads/libpayload/arch/i386/coreboot.c
+++ b/payloads/libpayload/arch/x86/coreboot.c
diff --git a/payloads/libpayload/arch/i386/exec.S b/payloads/libpayload/arch/x86/exec.S
index 9a44196e6b..9a44196e6b 100644
--- a/payloads/libpayload/arch/i386/exec.S
+++ b/payloads/libpayload/arch/x86/exec.S
diff --git a/payloads/libpayload/arch/i386/head.S b/payloads/libpayload/arch/x86/head.S
index 3dd61336f9..3dd61336f9 100644
--- a/payloads/libpayload/arch/i386/head.S
+++ b/payloads/libpayload/arch/x86/head.S
diff --git a/payloads/libpayload/arch/i386/main.c b/payloads/libpayload/arch/x86/main.c
index 1bac7a8aaa..1bac7a8aaa 100644
--- a/payloads/libpayload/arch/i386/main.c
+++ b/payloads/libpayload/arch/x86/main.c
diff --git a/payloads/libpayload/arch/i386/multiboot.c b/payloads/libpayload/arch/x86/multiboot.c
index fa0c576dc9..fa0c576dc9 100644
--- a/payloads/libpayload/arch/i386/multiboot.c
+++ b/payloads/libpayload/arch/x86/multiboot.c
diff --git a/payloads/libpayload/arch/i386/string.c b/payloads/libpayload/arch/x86/string.c
index 19047eee9e..19047eee9e 100644
--- a/payloads/libpayload/arch/i386/string.c
+++ b/payloads/libpayload/arch/x86/string.c
diff --git a/payloads/libpayload/arch/i386/sysinfo.c b/payloads/libpayload/arch/x86/sysinfo.c
index 6c1ef3fc1c..6c1ef3fc1c 100644
--- a/payloads/libpayload/arch/i386/sysinfo.c
+++ b/payloads/libpayload/arch/x86/sysinfo.c
diff --git a/payloads/libpayload/arch/i386/timer.c b/payloads/libpayload/arch/x86/timer.c
index ae288eb94e..ae288eb94e 100644
--- a/payloads/libpayload/arch/i386/timer.c
+++ b/payloads/libpayload/arch/x86/timer.c
diff --git a/payloads/libpayload/arch/i386/util.S b/payloads/libpayload/arch/x86/util.S
index 9858d29b05..9858d29b05 100644
--- a/payloads/libpayload/arch/i386/util.S
+++ b/payloads/libpayload/arch/x86/util.S
diff --git a/payloads/libpayload/arch/i386/virtual.c b/payloads/libpayload/arch/x86/virtual.c
index 59768dbd66..59768dbd66 100644
--- a/payloads/libpayload/arch/i386/virtual.c
+++ b/payloads/libpayload/arch/x86/virtual.c
diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index 241f15707a..6cba45d025 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -108,8 +108,8 @@ while [ $# -gt 0 ]; do
 done
 
 if [ "$CONFIG_ARCH_X86" = "y" ]; then
-  _ARCHINCDIR=$_INCDIR/i386
-  _ARCHLIBDIR=$_LIBDIR/i386
+  _ARCHINCDIR=$_INCDIR/x86
+  _ARCHLIBDIR=$_LIBDIR/x86
 fi
 
 if [ "$CONFIG_TARGET_POWERPC" = "y" ]; then
diff --git a/payloads/libpayload/include/i386/arch/io.h b/payloads/libpayload/include/x86/arch/io.h
index 31a8f88410..31a8f88410 100644
--- a/payloads/libpayload/include/i386/arch/io.h
+++ b/payloads/libpayload/include/x86/arch/io.h
diff --git a/payloads/libpayload/include/i386/arch/msr.h b/payloads/libpayload/include/x86/arch/msr.h
index c28b56cde1..c28b56cde1 100644
--- a/payloads/libpayload/include/i386/arch/msr.h
+++ b/payloads/libpayload/include/x86/arch/msr.h
diff --git a/payloads/libpayload/include/i386/arch/rdtsc.h b/payloads/libpayload/include/x86/arch/rdtsc.h
index ef23e0e247..ef23e0e247 100644
--- a/payloads/libpayload/include/i386/arch/rdtsc.h
+++ b/payloads/libpayload/include/x86/arch/rdtsc.h
diff --git a/payloads/libpayload/include/i386/arch/types.h b/payloads/libpayload/include/x86/arch/types.h
index 1bd815bb44..1bd815bb44 100644
--- a/payloads/libpayload/include/i386/arch/types.h
+++ b/payloads/libpayload/include/x86/arch/types.h
diff --git a/payloads/libpayload/include/i386/arch/virtual.h b/payloads/libpayload/include/x86/arch/virtual.h
index 328c3aa34e..328c3aa34e 100644
--- a/payloads/libpayload/include/i386/arch/virtual.h
+++ b/payloads/libpayload/include/x86/arch/virtual.h