libpayload: rename i386 to x86

Change-Id: Ia9170bd3d04e76dbf9321ca7ea4be23b5e468d21
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2033
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

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
 

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"

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