[coreboot-gerrit] Change in coreboot[master]: cpu/x86/mtrr.h: Get rid of commonlib/helpers.h dependency

[Nico Huber (Code Review)]

Hello Kyösti Mälkki,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/41785

to review the following change.

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

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 incompatible ALIGN()
definition.

Change-Id: I3bf20733418ca4135f364a3f6489e74d45e4f466
Signed-off-by: Nico Huber 
---
M src/include/cpu/x86/mtrr.h
1 file changed, 2 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/41785/1

diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h
index 50148ff..301ea30 100644
--- a/src/include/cpu/x86/mtrr.h
+++ b/src/include/cpu/x86/mtrr.h
@@ -1,7 +1,6 @@
 #ifndef CPU_X86_MTRR_H
 #define CPU_X86_MTRR_H

-#include <commonlib/helpers.h>
 #ifndef __ASSEMBLER__
 #include <cpu/x86/msr.h>
 #include <arch/cpu.h>
@@ -187,8 +186,8 @@

/* Last but not least, most (if not all) chipsets have MMIO
    between 0xfe000000 and 0xff000000, so limit to 16MiB. */
-#if CAR_CACHE_ROM_SIZE >= 16 * MiB
-# define CACHE_ROM_SIZE (16 * MiB)
+#if CAR_CACHE_ROM_SIZE >= 16 << 20
+# define CACHE_ROM_SIZE (16 << 20)
 #else
 # define CACHE_ROM_SIZE CAR_CACHE_ROM_SIZE
 #endif