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, 0 insertions, 76 deletions

diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
deleted file mode 100644
index e279db960c..0000000000
--- a/src/arch/x86/boot/cbmem.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
- */
-
-#include <stdlib.h>
-#include <console/console.h>
-#include <cbmem.h>
-#include <arch/acpi.h>
-
-#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
-
-#if !defined(__PRE_RAM__)
-void __attribute__((weak)) backup_top_of_ram(uint64_t ramtop)
-{
-	/* Do nothing. Chipset may have implementation to save ramtop in NVRAM. */
-}
-
-static void *ramtop_pointer;
-
-void set_top_of_ram(uint64_t ramtop)
-{
-	backup_top_of_ram(ramtop);
-	ramtop_pointer = (void *)(uintptr_t)ramtop;
-}
-
-static inline void *saved_ramtop(void)
-{
-	return ramtop_pointer;
-}
-#else
-static inline void *saved_ramtop(void)
-{
-	return NULL;
-}
-#endif /* !__PRE_RAM__ */
-
-unsigned long __attribute__((weak)) get_top_of_ram(void)
-{
-	return 0;
-}
-
-void *cbmem_top(void)
-{
-	/* Top of cbmem is at lowest usable DRAM address below 4GiB. */
-	void *ptr = saved_ramtop();
-
-	if (ptr != NULL)
-		return ptr;
-
-	return (void *)get_top_of_ram();
-}
-
-#endif /* LATE_CBMEM_INIT */
-
-/* Something went wrong, our high memory area got wiped */
-void cbmem_fail_resume(void)
-{
-#if !defined(__PRE_RAM__) && IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
-	/* ACPI resume needs to be cleared in the fail-to-recover case, but that
-	 * condition is only handled during ramstage. */
-	acpi_fail_wakeup();
-#endif
-}