summaryrefslogtreecommitdiff
path: root/src/pmm.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2013-02-20 23:48:22 -0500
committerKevin O'Connor <kevin@koconnor.net>2013-02-20 23:48:22 -0500
commite52ad390c73d26ee4fbc5d9a68b85d98b26561d6 (patch)
tree762a3ac704666958320c753957144745f49c635c /src/pmm.c
parent6d152646612f00f5e4792b3c32f659444ab16930 (diff)
downloadqemu-seabios-e52ad390c73d26ee4fbc5d9a68b85d98b26561d6.tar.gz
Use CONFIG_ prefix for Kconfig variables; use BUILD_ for others.
Rename remaining "build" settings in config.h that used the CONFIG_ prefix to use a BUILD_ prefix. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/pmm.c')
-rw-r--r--src/pmm.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pmm.c b/src/pmm.c
index dbe34a1..f02cf62 100644
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -240,7 +240,7 @@ malloc_preinit(void)
continue;
u32 s = en->start, e = end;
if (!highram) {
- u32 newe = ALIGN_DOWN(e - CONFIG_MAX_HIGHTABLE, MALLOC_MIN_ALIGN);
+ u32 newe = ALIGN_DOWN(e - BUILD_MAX_HIGHTABLE, MALLOC_MIN_ALIGN);
if (newe <= e && newe >= s) {
highram = newe;
e = newe;
@@ -253,8 +253,8 @@ malloc_preinit(void)
addSpace(&ZoneTmpLow, (void*)BUILD_STACK_ADDR, (void*)BUILD_EBDA_MINIMUM);
if (highram) {
addSpace(&ZoneHigh, (void*)highram
- , (void*)highram + CONFIG_MAX_HIGHTABLE);
- add_e820(highram, CONFIG_MAX_HIGHTABLE, E820_RESERVED);
+ , (void*)highram + BUILD_MAX_HIGHTABLE);
+ add_e820(highram, BUILD_MAX_HIGHTABLE, E820_RESERVED);
}
}
@@ -263,10 +263,10 @@ csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size)
{
ASSERT32FLAT();
- if (hi_pmm_size > CONFIG_MAX_HIGHTABLE) {
+ if (hi_pmm_size > BUILD_MAX_HIGHTABLE) {
void *hi_pmm_end = (void *)hi_pmm + hi_pmm_size;
- addSpace(&ZoneTmpHigh, (void *)hi_pmm, hi_pmm_end - CONFIG_MAX_HIGHTABLE);
- addSpace(&ZoneHigh, hi_pmm_end - CONFIG_MAX_HIGHTABLE, hi_pmm_end);
+ addSpace(&ZoneTmpHigh, (void *)hi_pmm, hi_pmm_end - BUILD_MAX_HIGHTABLE);
+ addSpace(&ZoneHigh, hi_pmm_end - BUILD_MAX_HIGHTABLE, hi_pmm_end);
} else {
addSpace(&ZoneTmpHigh, (void *)hi_pmm, (void *)hi_pmm + hi_pmm_size);
}