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

cpu/x86/mtrr.h: Get rid of commonlib/helpers.h dependency 

We want to use the CACHE_ROM_* macros in linker scripts. Avoid
`commonlib/helpers.h` as it contains an ALIGN() macro definition
that conflicts with the ALIGN keyword in linker scripts.

Change-Id: I3bf20733418ca4135f364a3f6489e74d45e4f466
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41785
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber 2020-05-27 17:29:30 +02:00 committed by Patrick Georgi
parent 4247ba3628
commit b781680d6e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/cpu/x86/mtrr.h
View File

@ -1,7 +1,6 @@
#ifndef CPU_X86_MTRR_H #ifndef CPU_X86_MTRR_H
#define CPU_X86_MTRR_H #define CPU_X86_MTRR_H
#include <commonlib/helpers.h>
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <arch/cpu.h> #include <arch/cpu.h>
@ -187,8 +186,8 @@ static inline unsigned int fls(unsigned int x)
/* Last but not least, most (if not all) chipsets have MMIO /* Last but not least, most (if not all) chipsets have MMIO
between 0xfe000000 and 0xff000000, so limit to 16MiB. */ between 0xfe000000 and 0xff000000, so limit to 16MiB. */
#if CAR_CACHE_ROM_SIZE >= 16 * MiB #if CAR_CACHE_ROM_SIZE >= 16 << 20
# define CACHE_ROM_SIZE (16 * MiB) # define CACHE_ROM_SIZE (16 << 20)
#else #else
# define CACHE_ROM_SIZE CAR_CACHE_ROM_SIZE # define CACHE_ROM_SIZE CAR_CACHE_ROM_SIZE
#endif #endif