From 3d8e53f85ad4cf6547f3e4c408aa49460fd76eec Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Mon, 29 Oct 2018 09:58:06 -0700
Subject: [PATCH] Add selfboot to the romstage

Now that bounce buffers are gone, and we can elide the selfload checking
code at build time, it is safe to add selfboot to the romstage.

Make it so.

This required a few other tweaks to rules.h and selfboot.c
to make it buildon ARM.

Change-Id: Ib6540921ad7cd7d58bfeab881d3978325b303cc2
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-on: https://review.coreboot.org/29338
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philipp Hug <philipp@hug.cx>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/lib/Makefile.inc | 1 +
 src/lib/selfboot.c   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 4ae80d3961..e988e89cd6 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -92,6 +92,7 @@ romstage-y += region_file.c
 ramstage-y += romstage_handoff.c
 romstage-y += romstage_handoff.c
 romstage-y += romstage_stack.c
+romstage-y += selfboot.c
 ramstage-y += romstage_stack.c
 romstage-y += stack.c
 ramstage-y += rtc.c
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index efd2d3d5a9..9c52cd6bef 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -18,7 +18,6 @@
 #include <commonlib/compression.h>
 #include <commonlib/endian.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>