Alexandru Gagniuc (mr.nuke.me@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13313
-gerrit
commit b6a687e76978ccf8e14088a56c21e82c5661a407 Author: Alexandru Gagniuc alexandrux.gagniuc@intel.com Date: Thu Oct 22 09:21:34 2015 -0700
soc/apollolake/cache_as_ram: 'call' don't 'jmp' to bootblock_main
After working without a stack for so long, it's easy to overlook that you have a stack, and that it works. The tendency to manually control the stack still exists. Just call 'bootblock_car_main', and avoid manually setting up a return pointer.
Change-Id: I257ba497dfa69902eff0686a5d2169db9b13434a Signed-off-by: Alexandru Gagniuc alexandrux.gagniuc@intel.com --- src/soc/intel/apollolake/bootblock/cache_as_ram.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/soc/intel/apollolake/bootblock/cache_as_ram.S b/src/soc/intel/apollolake/bootblock/cache_as_ram.S index 5bbf6cc..6ecfa86 100644 --- a/src/soc/intel/apollolake/bootblock/cache_as_ram.S +++ b/src/soc/intel/apollolake/bootblock/cache_as_ram.S @@ -135,9 +135,8 @@ car_init_done: before_carstage: post_code(0x2b)
- /* Call romstage.c main function. */ - push .halt_forever /* In case bootblock_car_main returns */ - jmp bootblock_car_main + /* Call bootblock C environment main function. */ + call bootblock_car_main
/* Never reached */