From f6935a006a6ffe57413877093035cdc1a020e7bd Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 14 Dec 2012 11:42:57 -0800 Subject: [PATCH] libpayload: rename i386 to x86 Change-Id: Ia9170bd3d04e76dbf9321ca7ea4be23b5e468d21 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/2033 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- payloads/libpayload/Makefile.inc | 2 +- payloads/libpayload/arch/Config.in | 2 +- payloads/libpayload/arch/{i386 => x86}/Config.in | 0 payloads/libpayload/arch/{i386 => x86}/Makefile.inc | 0 payloads/libpayload/arch/{i386 => x86}/coreboot.c | 0 payloads/libpayload/arch/{i386 => x86}/exec.S | 0 payloads/libpayload/arch/{i386 => x86}/head.S | 0 payloads/libpayload/arch/{i386 => x86}/main.c | 0 payloads/libpayload/arch/{i386 => x86}/multiboot.c | 0 payloads/libpayload/arch/{i386 => x86}/string.c | 0 payloads/libpayload/arch/{i386 => x86}/sysinfo.c | 0 payloads/libpayload/arch/{i386 => x86}/timer.c | 0 payloads/libpayload/arch/{i386 => x86}/util.S | 0 payloads/libpayload/arch/{i386 => x86}/virtual.c | 0 payloads/libpayload/bin/lpgcc | 4 ++-- payloads/libpayload/include/{i386 => x86}/arch/io.h | 0 payloads/libpayload/include/{i386 => x86}/arch/msr.h | 0 payloads/libpayload/include/{i386 => x86}/arch/rdtsc.h | 0 payloads/libpayload/include/{i386 => x86}/arch/types.h | 0 payloads/libpayload/include/{i386 => x86}/arch/virtual.h | 0 20 files changed, 4 insertions(+), 4 deletions(-) rename payloads/libpayload/arch/{i386 => x86}/Config.in (100%) rename payloads/libpayload/arch/{i386 => x86}/Makefile.inc (100%) rename payloads/libpayload/arch/{i386 => x86}/coreboot.c (100%) rename payloads/libpayload/arch/{i386 => x86}/exec.S (100%) rename payloads/libpayload/arch/{i386 => x86}/head.S (100%) rename payloads/libpayload/arch/{i386 => x86}/main.c (100%) rename payloads/libpayload/arch/{i386 => x86}/multiboot.c (100%) rename payloads/libpayload/arch/{i386 => x86}/string.c (100%) rename payloads/libpayload/arch/{i386 => x86}/sysinfo.c (100%) rename payloads/libpayload/arch/{i386 => x86}/timer.c (100%) rename payloads/libpayload/arch/{i386 => x86}/util.S (100%) rename payloads/libpayload/arch/{i386 => x86}/virtual.c (100%) rename payloads/libpayload/include/{i386 => x86}/arch/io.h (100%) rename payloads/libpayload/include/{i386 => x86}/arch/msr.h (100%) rename payloads/libpayload/include/{i386 => x86}/arch/rdtsc.h (100%) rename payloads/libpayload/include/{i386 => x86}/arch/types.h (100%) rename payloads/libpayload/include/{i386 => x86}/arch/virtual.h (100%) 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 similarity index 100% rename from payloads/libpayload/arch/i386/Config.in rename to payloads/libpayload/arch/x86/Config.in diff --git a/payloads/libpayload/arch/i386/Makefile.inc b/payloads/libpayload/arch/x86/Makefile.inc similarity index 100% rename from payloads/libpayload/arch/i386/Makefile.inc rename to payloads/libpayload/arch/x86/Makefile.inc diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/x86/coreboot.c similarity index 100% rename from payloads/libpayload/arch/i386/coreboot.c rename to payloads/libpayload/arch/x86/coreboot.c diff --git a/payloads/libpayload/arch/i386/exec.S b/payloads/libpayload/arch/x86/exec.S similarity index 100% rename from payloads/libpayload/arch/i386/exec.S rename to payloads/libpayload/arch/x86/exec.S diff --git a/payloads/libpayload/arch/i386/head.S b/payloads/libpayload/arch/x86/head.S similarity index 100% rename from payloads/libpayload/arch/i386/head.S rename to payloads/libpayload/arch/x86/head.S diff --git a/payloads/libpayload/arch/i386/main.c b/payloads/libpayload/arch/x86/main.c similarity index 100% rename from payloads/libpayload/arch/i386/main.c rename to payloads/libpayload/arch/x86/main.c diff --git a/payloads/libpayload/arch/i386/multiboot.c b/payloads/libpayload/arch/x86/multiboot.c similarity index 100% rename from payloads/libpayload/arch/i386/multiboot.c rename to payloads/libpayload/arch/x86/multiboot.c diff --git a/payloads/libpayload/arch/i386/string.c b/payloads/libpayload/arch/x86/string.c similarity index 100% rename from payloads/libpayload/arch/i386/string.c rename to payloads/libpayload/arch/x86/string.c diff --git a/payloads/libpayload/arch/i386/sysinfo.c b/payloads/libpayload/arch/x86/sysinfo.c similarity index 100% rename from payloads/libpayload/arch/i386/sysinfo.c rename to payloads/libpayload/arch/x86/sysinfo.c diff --git a/payloads/libpayload/arch/i386/timer.c b/payloads/libpayload/arch/x86/timer.c similarity index 100% rename from payloads/libpayload/arch/i386/timer.c rename to payloads/libpayload/arch/x86/timer.c diff --git a/payloads/libpayload/arch/i386/util.S b/payloads/libpayload/arch/x86/util.S similarity index 100% rename from payloads/libpayload/arch/i386/util.S rename to payloads/libpayload/arch/x86/util.S diff --git a/payloads/libpayload/arch/i386/virtual.c b/payloads/libpayload/arch/x86/virtual.c similarity index 100% rename from payloads/libpayload/arch/i386/virtual.c rename to 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 similarity index 100% rename from payloads/libpayload/include/i386/arch/io.h rename to 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 similarity index 100% rename from payloads/libpayload/include/i386/arch/msr.h rename to 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 similarity index 100% rename from payloads/libpayload/include/i386/arch/rdtsc.h rename to 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 similarity index 100% rename from payloads/libpayload/include/i386/arch/types.h rename to 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 similarity index 100% rename from payloads/libpayload/include/i386/arch/virtual.h rename to payloads/libpayload/include/x86/arch/virtual.h