diff options
Diffstat (limited to 'payloads/libpayload')
| -rw-r--r-- | payloads/libpayload/Config.in | 6 | ||||
| -rw-r--r-- | payloads/libpayload/Makefile.inc | 2 | ||||
| -rw-r--r-- | payloads/libpayload/arch/i386/Config.in | 2 | ||||
| -rwxr-xr-x | payloads/libpayload/bin/lpgcc | 2 | ||||
| -rw-r--r-- | payloads/libpayload/configs/defconfig | 2 | ||||
| -rw-r--r-- | payloads/libpayload/crypto/sha1.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/include/cbfs_core.h | 2 | ||||
| -rw-r--r-- | payloads/libpayload/libc/exec.c | 4 | ||||
| -rw-r--r-- | payloads/libpayload/libc/time.c | 4 |
9 files changed, 13 insertions, 13 deletions
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index 65be223068..bf30a44360 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -65,9 +65,9 @@ menu "Architecture Options" choice prompt "Target Architecture" - default TARGET_I386 + default ARCH_X86 -config TARGET_I386 +config ARCH_X86 bool "x86" help Support the x86 architecture @@ -85,7 +85,7 @@ config MEMMAP_RAM_ONLY config MULTIBOOT bool "Multiboot header support" - depends on TARGET_I386 + depends on ARCH_X86 default y endmenu diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index f0f4dffed7..7d74cf997b 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -31,7 +31,7 @@ export KERNELVERSION := 0.2.0 -ARCHDIR-$(CONFIG_TARGET_I386) := i386 +ARCHDIR-$(CONFIG_ARCH_X86) := i386 ARCHDIR-$(CONFIG_TARGET_POWERPC) := powerpc DESTDIR ?= install diff --git a/payloads/libpayload/arch/i386/Config.in b/payloads/libpayload/arch/i386/Config.in index ec4c97870d..242d8b1e08 100644 --- a/payloads/libpayload/arch/i386/Config.in +++ b/payloads/libpayload/arch/i386/Config.in @@ -20,7 +20,7 @@ ## MA 02111-1307 USA ## -if TARGET_I386 +if ARCH_X86 config ARCH_SPECIFIC_OPTIONS # dummy def_bool y diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index 8ee0dcfbb9..b102c853f9 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -102,7 +102,7 @@ while [ $# -gt 0 ]; do shift done -if [ "$CONFIG_TARGET_I386" = "y" ]; then +if [ "$CONFIG_ARCH_X86" = "y" ]; then _ARCHINCDIR=$_INCDIR/i386 _ARCHLIBDIR=$_LIBDIR/i386 fi diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index d5876fca37..87d9d4b67c 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -14,7 +14,7 @@ # # Architecture Options # -CONFIG_TARGET_I386=y +CONFIG_ARCH_X86=y # CONFIG_TARGET_POWERPC is not set # CONFIG_MEMMAP_RAM_ONLY is not set # CONFIG_MULTIBOOT is not set diff --git a/payloads/libpayload/crypto/sha1.c b/payloads/libpayload/crypto/sha1.c index 8d849db71d..3c97bf1895 100644 --- a/payloads/libpayload/crypto/sha1.c +++ b/payloads/libpayload/crypto/sha1.c @@ -30,7 +30,7 @@ typedef unsigned int u_int; /* Moved from libpayload.h */ -#ifdef CONFIG_TARGET_I386 +#ifdef CONFIG_ARCH_X86 #define BYTE_ORDER LITTLE_ENDIAN #else #define BYTE_ORDER BIG_ENDIAN diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index 5858783bc6..32f2670b5b 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -82,7 +82,7 @@ so we can easily find it. */ #define CBFS_HEADER_MAGIC 0x4F524243 -#if CONFIG_TARGET_I386 +#if CONFIG_ARCH_X86 #define CBFS_HEADPTR_ADDR 0xFFFFFFFC #endif #define VERSION1 0x31313131 diff --git a/payloads/libpayload/libc/exec.c b/payloads/libpayload/libc/exec.c index bb531d8f67..13a1e5a8cd 100644 --- a/payloads/libpayload/libc/exec.c +++ b/payloads/libpayload/libc/exec.c @@ -30,7 +30,7 @@ #include <libpayload-config.h> #include <libpayload.h> -#ifdef CONFIG_TARGET_I386 +#ifdef CONFIG_ARCH_X86 extern void i386_do_exec(long addr, int argc, char **argv, int *ret); #endif @@ -46,7 +46,7 @@ int exec(long addr, int argc, char **argv) { int val = -1; -#ifdef CONFIG_TARGET_I386 +#ifdef CONFIG_ARCH_X86 i386_do_exec(addr, argc, argv, &val); #endif return val; diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c index 67675623a4..5ff47b3868 100644 --- a/payloads/libpayload/libc/time.c +++ b/payloads/libpayload/libc/time.c @@ -34,7 +34,7 @@ #include <libpayload-config.h> #include <libpayload.h> -#ifdef CONFIG_TARGET_I386 +#ifdef CONFIG_ARCH_X86 #include <arch/rdtsc.h> #endif @@ -49,7 +49,7 @@ static struct { #define TICKS_PER_SEC (cpu_khz * 1000) #define TICKS_PER_USEC (cpu_khz / 1000) -#ifdef CONFIG_TARGET_I386 +#ifdef CONFIG_ARCH_X86 static void update_clock(void) { u64 delta = rdtsc() - clock.ticks; |