sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change TARGET_I386 to ARCH_X86

Browse Source 
This renames TARGET_I386 to ARCH_X86 to make it more uniform with
other parts of the codebase, e.g. cbfs_core.h from cbfstool.

Change-Id: I1babcc941245ed1dde0478a21828766759373a42
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/1961
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Dave Frodin <dave.frodin@se-eng.com>
This commit is contained in:
David Hendricks
2012-11-30 13:56:31 -08:00
parent 0a92f89f5d
commit 4b6be985aa
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
payloads/libpayload/Config.in
View File

@ -65,9 +65,9 @@ menu "Architecture Options"
choice choice
prompt "Target Architecture" prompt "Target Architecture"
default TARGET_I386 default ARCH_X86
config TARGET_I386 config ARCH_X86
bool "x86" bool "x86"
help help
Support the x86 architecture Support the x86 architecture
@ -85,7 +85,7 @@ config MEMMAP_RAM_ONLY
config MULTIBOOT config MULTIBOOT
bool "Multiboot header support" bool "Multiboot header support"
depends on TARGET_I386 depends on ARCH_X86
default y default y
endmenu endmenu

2
payloads/libpayload/Makefile.inc
View File

@ -31,7 +31,7 @@
export KERNELVERSION := 0.2.0 export KERNELVERSION := 0.2.0
ARCHDIR-$(CONFIG_TARGET_I386) := i386 ARCHDIR-$(CONFIG_ARCH_X86) := i386
ARCHDIR-$(CONFIG_TARGET_POWERPC) := powerpc ARCHDIR-$(CONFIG_TARGET_POWERPC) := powerpc
DESTDIR ?= install DESTDIR ?= install

2
payloads/libpayload/arch/i386/Config.in
View File

@ -20,7 +20,7 @@
## MA 02111-1307 USA ## MA 02111-1307 USA
## ##
if TARGET_I386 if ARCH_X86
config ARCH_SPECIFIC_OPTIONS # dummy config ARCH_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y

2
payloads/libpayload/bin/lpgcc
View File

@ -102,7 +102,7 @@ while [ $# -gt 0 ]; do
shift shift
done done
if [ "$CONFIG_TARGET_I386" = "y" ]; then if [ "$CONFIG_ARCH_X86" = "y" ]; then
_ARCHINCDIR=$_INCDIR/i386 _ARCHINCDIR=$_INCDIR/i386
_ARCHLIBDIR=$_LIBDIR/i386 _ARCHLIBDIR=$_LIBDIR/i386
fi fi

2
payloads/libpayload/configs/defconfig
View File

@ -14,7 +14,7 @@
# #
# Architecture Options # Architecture Options
# #
CONFIG_TARGET_I386=y CONFIG_ARCH_X86=y
# CONFIG_TARGET_POWERPC is not set # CONFIG_TARGET_POWERPC is not set
# CONFIG_MEMMAP_RAM_ONLY is not set # CONFIG_MEMMAP_RAM_ONLY is not set
# CONFIG_MULTIBOOT is not set # CONFIG_MULTIBOOT is not set

2
payloads/libpayload/crypto/sha1.c
View File

@ -30,7 +30,7 @@ typedef unsigned int u_int;
/* Moved from libpayload.h */ /* Moved from libpayload.h */
#ifdef CONFIG_TARGET_I386 #ifdef CONFIG_ARCH_X86
#define BYTE_ORDER LITTLE_ENDIAN #define BYTE_ORDER LITTLE_ENDIAN
#else #else
#define BYTE_ORDER BIG_ENDIAN #define BYTE_ORDER BIG_ENDIAN

2
payloads/libpayload/include/cbfs_core.h
View File

@ -82,7 +82,7 @@
so we can easily find it. */ so we can easily find it. */
#define CBFS_HEADER_MAGIC 0x4F524243 #define CBFS_HEADER_MAGIC 0x4F524243
#if CONFIG_TARGET_I386 #if CONFIG_ARCH_X86
#define CBFS_HEADPTR_ADDR 0xFFFFFFFC #define CBFS_HEADPTR_ADDR 0xFFFFFFFC
#endif #endif
#define VERSION1 0x31313131 #define VERSION1 0x31313131

4
payloads/libpayload/libc/exec.c
View File

@ -30,7 +30,7 @@
#include <libpayload-config.h> #include <libpayload-config.h>
#include <libpayload.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); extern void i386_do_exec(long addr, int argc, char **argv, int *ret);
#endif #endif
@ -46,7 +46,7 @@ int exec(long addr, int argc, char **argv)
{ {
int val = -1; int val = -1;
#ifdef CONFIG_TARGET_I386 #ifdef CONFIG_ARCH_X86
i386_do_exec(addr, argc, argv, &val); i386_do_exec(addr, argc, argv, &val);
#endif #endif
return val; return val;

4
payloads/libpayload/libc/time.c
View File

@ -34,7 +34,7 @@
#include <libpayload-config.h> #include <libpayload-config.h>
#include <libpayload.h> #include <libpayload.h>
#ifdef CONFIG_TARGET_I386 #ifdef CONFIG_ARCH_X86
#include <arch/rdtsc.h> #include <arch/rdtsc.h>
#endif #endif
@ -49,7 +49,7 @@ static struct {
#define TICKS_PER_SEC (cpu_khz * 1000) #define TICKS_PER_SEC (cpu_khz * 1000)
#define TICKS_PER_USEC (cpu_khz / 1000) #define TICKS_PER_USEC (cpu_khz / 1000)
#ifdef CONFIG_TARGET_I386 #ifdef CONFIG_ARCH_X86
static void update_clock(void) static void update_clock(void)
{ {
u64 delta = rdtsc() - clock.ticks; u64 delta = rdtsc() - clock.ticks;