GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mini fix to reliably compile inteltool on darwin, and on Linux both on x86/x86_64. 

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4190 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-04-22 23:17:44 +00:00 committed by Stefan Reinauer
parent 554fce6ced
commit f182456013
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/inteltool/cpu.c
View File

@ -32,6 +32,7 @@ unsigned int cpuid(unsigned int op)
{ {
unsigned int ret; unsigned int ret;
unsigned int dummy2, dummy3, dummy4; unsigned int dummy2, dummy3, dummy4;
#if DARWIN
asm volatile ( asm volatile (
"pushl %%ebx \n" "pushl %%ebx \n"
"cpuid \n" "cpuid \n"
@ -41,6 +42,14 @@ unsigned int cpuid(unsigned int op)
: "a" (op) : "a" (op)
: "cc" : "cc"
); );
#else
asm volatile (
"cpuid"
: "=a" (ret), "=b" (dummy2), "=c" (dummy3), "=d" (dummy4)
: "a" (op)
: "cc"
);
#endif
return ret; return ret;
} }

2
util/inteltool/inteltool.c
View File

@ -57,7 +57,7 @@ void *map_physical(unsigned long phys_addr, int len)
fd_mem, (off_t) phys_addr); fd_mem, (off_t) phys_addr);
if (virt_addr == MAP_FAILED) { if (virt_addr == MAP_FAILED) {
printf("Error mapping physical memory 0x%08x[0x%x]\n", phys_addr, len); printf("Error mapping physical memory 0x%08lx[0x%x]\n", phys_addr, len);
return NULL; return NULL;
} }