diff options
| -rw-r--r-- | src/arch/i386/init/crt0_romcc_epilogue.inc | 12 | ||||
| -rw-r--r-- | src/cpu/via/car/cache_as_ram.inc | 14 |
2 files changed, 18 insertions, 8 deletions
diff --git a/src/arch/i386/init/crt0_romcc_epilogue.inc b/src/arch/i386/init/crt0_romcc_epilogue.inc index 25c3633c66..9476607f1e 100644 --- a/src/arch/i386/init/crt0_romcc_epilogue.inc +++ b/src/arch/i386/init/crt0_romcc_epilogue.inc @@ -14,8 +14,16 @@ __main: movl %ebp, %esi - /* FIXME: look for a proper place for the stack */ - movl $0x4000000, %esp + /* For now: use CONFIG_RAMBASE + 1MB - 64K (counting downwards) as stack. This + * makes sure that we stay completely within the 1M-64K of memory that we + * preserve for suspend/resume. + */ + +#ifndef HIGH_MEMORY_SAVE +#warning Need a central place for HIGH_MEMORY_SAVE +#define HIGH_MEMORY_SAVE ( (1024 - 64) * 1024 ) +#endif + movl $(CONFIG_RAMBASE + HIGH_MEMORY_SAVE), %esp movl %esp, %ebp pushl %esi call copy_and_run diff --git a/src/cpu/via/car/cache_as_ram.inc b/src/cpu/via/car/cache_as_ram.inc index c926ab6f91..c49c3e4c2e 100644 --- a/src/cpu/via/car/cache_as_ram.inc +++ b/src/cpu/via/car/cache_as_ram.inc @@ -270,14 +270,16 @@ __main: movl %ebp, %esi - /* FIXME: These values might have to change for suspend-to-ram. - * the 0x00400000 was chosen as this is a place in memory that - * should exist in all contemporary configurations (ie. large - * enough RAM), but doesn't collide with anything coreboot does. - * Other than that, it's arbitrary. + /* For now: use CONFIG_RAMBASE + 1MB - 64K (counting downwards) as stack. This + * makes sure that we stay completely within the 1M-64K of memory that we + * preserve for suspend/resume. */ - movl $0x4000000, %esp +#ifndef HIGH_MEMORY_SAVE +#warning Need a central place for HIGH_MEMORY_SAVE +#define HIGH_MEMORY_SAVE ( (1024 - 64) * 1024 ) +#endif + movl $(CONFIG_RAMBASE + HIGH_MEMORY_SAVE), %esp movl %esp, %ebp pushl %esi call copy_and_run |