diff options
| author | Gabe Black <gabeblack@google.com> | 2013-08-09 04:27:35 -0700 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-08-05 18:44:08 +0200 |
| commit | 1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f (patch) | |
| tree | fabae429ff872caed315281a0c243fa0bd753565 /payloads/libpayload/libc/malloc.c | |
| parent | b77431336e44ba9721f18220e2a7dedafe250528 (diff) | |
libpayload: Change CONFIG_* to CONFIG_LP_* in the kconfig.
When libpayload header files are included in the payload itself, it's possible
that the payloads config settings will conflict with the ones in libpayload.
It's also possible for the libpayload config settings to conflict with the
payloads. To avoid that, the libpayload config settings have _LP_ (for
libpayload) added to them. The symbols themselves as defined in the Config.in files
are still the same, but the prefix added to them is now CONFIG_LP_ instead of just
CONFIG_.
Change-Id: Ib8a46d202e7880afdeac7924d69a949bfbcc5f97
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/65303
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 23e866da20862cace0ed2a67d6fb74056bc9ea9a)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6427
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'payloads/libpayload/libc/malloc.c')
| -rw-r--r-- | payloads/libpayload/libc/malloc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/payloads/libpayload/libc/malloc.c b/payloads/libpayload/libc/malloc.c index 851ef574e2..f022f7349a 100644 --- a/payloads/libpayload/libc/malloc.c +++ b/payloads/libpayload/libc/malloc.c @@ -68,7 +68,7 @@ typedef u64 hdrtype_t; static int free_aligned(void* addr); void print_malloc_map(void); -#ifdef CONFIG_DEBUG_MALLOC +#ifdef CONFIG_LP_DEBUG_MALLOC static int heap_initialized = 0; static int minimal_free = 0; #endif @@ -77,7 +77,7 @@ static void setup(hdrtype_t volatile *start, int size) { *start = FREE_BLOCK(size); -#ifdef CONFIG_DEBUG_MALLOC +#ifdef CONFIG_LP_DEBUG_MALLOC heap_initialized = 1; minimal_free = size; #endif @@ -282,7 +282,7 @@ static struct align_region_t* align_regions = 0; static struct align_region_t *allocate_region(int alignment, int num_elements) { struct align_region_t *new_region; -#ifdef CONFIG_DEBUG_MALLOC +#ifdef CONFIG_LP_DEBUG_MALLOC printf("%s(old align_regions=%p, alignment=%u, num_elements=%u)\n", __func__, align_regions, alignment, num_elements); #endif @@ -344,7 +344,7 @@ look_further: { if ((reg->alignment == align) && (reg->free >= (size + align - 1)/align)) { -#ifdef CONFIG_DEBUG_MALLOC +#ifdef CONFIG_LP_DEBUG_MALLOC printf(" found memalign region. %x free, %x required\n", reg->free, (size + align - 1)/align); #endif break; @@ -353,12 +353,12 @@ look_further: } if (reg == 0) { -#ifdef CONFIG_DEBUG_MALLOC +#ifdef CONFIG_LP_DEBUG_MALLOC printf(" need to allocate a new memalign region\n"); #endif /* get align regions */ reg = allocate_region(align, (size<1024)?(1024/align):(((size-1)/align)+1)); -#ifdef CONFIG_DEBUG_MALLOC +#ifdef CONFIG_LP_DEBUG_MALLOC printf(" ... returned %p\n", align_regions); #endif } @@ -394,7 +394,7 @@ look_further: } /* This is for debugging purposes. */ -#ifdef CONFIG_DEBUG_MALLOC +#ifdef CONFIG_LP_DEBUG_MALLOC void print_malloc_map(void) { void *ptr = hstart; |