diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-10-16 16:32:57 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-10-16 16:32:57 +0000 |
| commit | 0f61a4fc98f135c0ed22c67ee3241bf5670a61e2 (patch) | |
| tree | b3867408477cdf8a3a2374f32d91b4f3936b7486 /src/config | |
| parent | 9969bdc4fb3d36a39ed9efb67ef0bf638a4e8e09 (diff) | |
Change CONFIG_LB_MEM_TOPK to CONFIG_RAMTOP to match CONFIG_RAMBASE.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4788 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/Options.lb | 6 | ||||
| -rw-r--r-- | src/config/coreboot_ram.ld | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/config/Options.lb b/src/config/Options.lb index cd1dc76731..d264c5985e 100644 --- a/src/config/Options.lb +++ b/src/config/Options.lb @@ -360,11 +360,11 @@ define CONFIG_UNCOMPRESSED export always comment "Set for uncompressed image" end -define CONFIG_LB_MEM_TOPK +define CONFIG_RAMTOP format "%d" - default 2048 + default 2048*1024 export always - comment "Kilobytes of memory to initialized before executing code from RAM" + comment "Highest RAM that coreboot_ram will use" end define CONFIG_HAVE_OPTION_TABLE default 0 diff --git a/src/config/coreboot_ram.ld b/src/config/coreboot_ram.ld index 5e988ffeaf..afdf8a5522 100644 --- a/src/config/coreboot_ram.ld +++ b/src/config/coreboot_ram.ld @@ -103,8 +103,8 @@ SECTIONS _stack = .; .stack . : { /* Reserve a stack for each possible cpu */ - /* the stack for ap will be put after pgtbl in 1M to CONFIG_LB_MEM_TOPK range when VGA and ROM_RUN and CONFIG_LB_MEM_TOPK>1024*/ - . = ((CONFIG_CONSOLE_VGA || CONFIG_PCI_ROM_RUN)&&(CONFIG_RAMBASE<0x100000)&&(CONFIG_LB_MEM_TOPK>(0x100000>>10)) ) ? CONFIG_STACK_SIZE : (CONFIG_MAX_CPUS*CONFIG_STACK_SIZE); + /* the stack for ap will be put after pgtbl in 1M to CONFIG_RAMTOP range when VGA and ROM_RUN and CONFIG_RAMTOP>1M*/ + . = ((CONFIG_CONSOLE_VGA || CONFIG_PCI_ROM_RUN)&&(CONFIG_RAMBASE<0x100000)&&(CONFIG_RAMTOP>0x100000) ) ? CONFIG_STACK_SIZE : (CONFIG_MAX_CPUS*CONFIG_STACK_SIZE); } _estack = .; _heap = .; @@ -120,9 +120,9 @@ SECTIONS _ram_seg = _text; _eram_seg = _eheap; - _bogus = ASSERT( ( (_eram_seg>>10) < (CONFIG_LB_MEM_TOPK)) , "please increase CONFIG_LB_MEM_TOPK"); + _bogus = ASSERT( ( _eram_seg < (CONFIG_RAMTOP)) , "please increase CONFIG_RAMTOP"); - _bogus = ASSERT( !((CONFIG_CONSOLE_VGA || CONFIG_PCI_ROM_RUN) && ((_ram_seg<0xa0000) && (_eram_seg>0xa0000))) , "please increase CONFIG_LB_MEM_TOPK and if still fail, try to set CONFIG_RAMBASE more than 1M"); + _bogus = ASSERT( !((CONFIG_CONSOLE_VGA || CONFIG_PCI_ROM_RUN) && ((_ram_seg<0xa0000) && (_eram_seg>0xa0000))) , "please increase CONFIG_RAMTOP and if still fail, try to set CONFIG_RAMBASE more than 1M"); /DISCARD/ : { *(.comment) |