From 3f854dccfdf5fd452852f05276034ffcaf882d8a Mon Sep 17 00:00:00 2001
From: Marcelo Povoa <marcelogp@chromium.org>
Date: Tue, 18 Feb 2014 12:48:16 -0800
Subject: [PATCH] aarch64: Pass coreboot table in jmp_to_elf_entry

BUG=None
BRANCH=none
TEST=Boot to libpayload hello.c ELF at 0x80100000 which reads cb_table

Change-Id: Ia1be4cb03386011a3184e76ed048cf589b390d11
Signed-off-by: Marcelo Povoa <marcelogp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/186929
Reviewed-by: David Hendricks <dhendrix@chromium.org>
---
 src/arch/aarch64/boot.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/arch/aarch64/boot.c b/src/arch/aarch64/boot.c
index 677480230b..6fb0e650b5 100644
--- a/src/arch/aarch64/boot.c
+++ b/src/arch/aarch64/boot.c
@@ -17,11 +17,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <console/console.h>
+#include <arch/cache.h>
 #include <arch/stages.h>
+#include <cbmem.h>
+#include <console/console.h>
 
 void jmp_to_elf_entry(void *entry, unsigned long buffer, unsigned long size)
 {
+	void (*doit)(void *) = entry;
+	void *cb_tables = cbmem_find(CBMEM_ID_CBTABLE);
+
 	printk(BIOS_SPEW, "entry    = %p\n", entry);
-	stage_exit(entry);
+	cache_sync_instructions();
+	doit(cb_tables);
 }