aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-07-01 16:42:35 +0800
committerFeng Tang <feng.tang@intel.com>2010-07-20 11:10:04 +0800
commit0b6c1cd6e2434310b225525301f5878e4754b56c (patch)
treebe6cbfe15f34780b991abdad9e22abf91506f21e
parent4b0e99d36684588d564cf0fec66f648ffc9ebb76 (diff)
downloadsyslinux-0b6c1cd6e2434310b225525301f5878e4754b56c.tar.gz
syslinux-0b6c1cd6e2434310b225525301f5878e4754b56c.tar.xz
syslinux-0b6c1cd6e2434310b225525301f5878e4754b56c.zip
elflink: some cleanup
-rw-r--r--core/diskstart.inc8
-rw-r--r--core/mem/init.c14
2 files changed, 10 insertions, 12 deletions
diff --git a/core/diskstart.inc b/core/diskstart.inc
index 3ffae852..4084ff78 100644
--- a/core/diskstart.inc
+++ b/core/diskstart.inc
@@ -754,13 +754,13 @@ expand_super:
mov di,[bsSecPerTrack]
movzx ebp,word [MaxTransfer]
- mov si,ebios_name
- call writestr_early
+ ;mov si,ebios_name
+ ;call writestr_early
pm_call fs_init
- mov si,ebios_name
- call writestr_early
+ ;mov si,ebios_name
+ ;call writestr_early
pm_call load_env32
popad
diff --git a/core/mem/init.c b/core/mem/init.c
index be4f312a..bfc64301 100644
--- a/core/mem/init.c
+++ b/core/mem/init.c
@@ -8,7 +8,7 @@
struct free_arena_header __core_malloc_head[NHEAP];
-static __hugebss char main_heap[128 << 10];
+//static __hugebss char main_heap[128 << 10];
extern char __lowmem_heap[];
extern char free_high_memory[];
@@ -70,7 +70,7 @@ void mem_init(void)
int i;
uint16_t *bios_free_mem = (uint16_t *)0x413;
- mp("enter");
+ //mp("enter");
/* Initialize the head nodes */
fp = &__core_malloc_head[0];
@@ -80,11 +80,10 @@ void mem_init(void)
fp->a.tag = MALLOC_HEAD;
fp++;
}
-
- /*
- mp("__lowmem_heap = 0x%p bios_free = 0x%p",
- __lowmem_heap, *bios_free_mem);
- */
+
+ //mp("__lowmem_heap = 0x%p bios_free = 0x%p",
+ // __lowmem_heap, *bios_free_mem);
+
/* Initialize the lowmem heap */
fp = (struct free_arena_header *)__lowmem_heap;
fp->a.attrs = ARENA_TYPE_USED | (HEAP_LOWMEM << ARENA_HEAP_POS);
@@ -95,5 +94,4 @@ void mem_init(void)
__com32.cs_memsize = free_high_memory;
syslinux_scan_memory(scan_highmem_area, NULL);
- //mpool_dump(HEAP_MAIN);
}