summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/ppc64/Kconfig1
-rw-r--r--src/arch/ppc64/include/arch/stages.h2
-rw-r--r--src/arch/ppc64/stages.c5
-rw-r--r--src/mainboard/emulation/qemu-power8/Makefile.inc1
4 files changed, 6 insertions, 3 deletions
diff --git a/src/arch/ppc64/Kconfig b/src/arch/ppc64/Kconfig
index 0699e910ce..da9c155917 100644
--- a/src/arch/ppc64/Kconfig
+++ b/src/arch/ppc64/Kconfig
@@ -1,5 +1,6 @@
config ARCH_PPC64
bool
+ select RAMSTAGE_CBMEM_TOP_ARG
config ARCH_BOOTBLOCK_PPC64
bool
diff --git a/src/arch/ppc64/include/arch/stages.h b/src/arch/ppc64/include/arch/stages.h
index a4939b1758..37e9f85c8c 100644
--- a/src/arch/ppc64/include/arch/stages.h
+++ b/src/arch/ppc64/include/arch/stages.h
@@ -16,6 +16,6 @@
#include <main_decl.h>
-void stage_entry(void) __attribute__((section(".text.stage_entry")));
+void stage_entry(uintptr_t stage_arg) __attribute__((section(".text.stage_entry")));
#endif
diff --git a/src/arch/ppc64/stages.c b/src/arch/ppc64/stages.c
index 3cc9371ffe..aacf45f88f 100644
--- a/src/arch/ppc64/stages.c
+++ b/src/arch/ppc64/stages.c
@@ -22,9 +22,12 @@
* linker script.
*/
+#include <cbmem.h>
#include <arch/stages.h>
-void stage_entry(void)
+void stage_entry(uintptr_t stage_arg)
{
+ if (!ENV_ROMSTAGE_OR_BEFORE)
+ _cbmem_top_ptr = stage_arg;
main();
}
diff --git a/src/mainboard/emulation/qemu-power8/Makefile.inc b/src/mainboard/emulation/qemu-power8/Makefile.inc
index 5c6c56e5de..307cb191bd 100644
--- a/src/mainboard/emulation/qemu-power8/Makefile.inc
+++ b/src/mainboard/emulation/qemu-power8/Makefile.inc
@@ -15,7 +15,6 @@
bootblock-y += bootblock.c
bootblock-y += uart.c
romstage-y += cbmem.c
-ramstage-y += cbmem.c
romstage-y += romstage.c
ramstage-y += timer.c
romstage-y += uart.c