x86: flatten hierarchy

It never made sense to have bootblock_* in init, but
pirq_routing.c in boot, and some ld scripts on the main
level while others live in subdirectories.

This patch flattens the directory hierarchy and makes
x86 more similar to the other architectures.

Change-Id: I4056038fe7813e4d3d3042c441e7ab6076a36384
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10901
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

1 files changed, 23 insertions, 0 deletions

diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c
new file mode 100644
index 0000000000..adeecf7ba6
--- /dev/null
+++ b/src/arch/x86/bootblock_simple.c
@@ -0,0 +1,23 @@
+#include <smp/node.h>
+#include <bootblock_common.h>
+#include <halt.h>
+
+static void main(unsigned long bist)
+{
+	if (boot_cpu()) {
+		bootblock_mainboard_init();
+
+#if CONFIG_USE_OPTION_TABLE
+		sanitize_cmos();
+#endif
+#if CONFIG_CMOS_POST
+		cmos_post_init();
+#endif
+	}
+
+	const char* target1 = "fallback/romstage";
+	unsigned long entry;
+	entry = findstage(target1);
+	if (entry) call(entry, bist);
+	halt();
+}