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, 75 deletions

diff --git a/src/arch/x86/lib/mmap_boot.c b/src/arch/x86/lib/mmap_boot.c
deleted file mode 100644
index 4dd269b772..0000000000
--- a/src/arch/x86/lib/mmap_boot.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2015 Google Inc.
- *
- * 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 <boot_device.h>
-#include <console/console.h>
-#include <cbfs.h>
-#include <endian.h>
-#include <stdlib.h>
-
-/* The ROM is memory mapped just below 4GiB. Form a pointer for the base. */
-#define rom_base ((void *)(uintptr_t)(-(int32_t)CONFIG_ROM_SIZE))
-
-static const struct mem_region_device boot_dev =
-	MEM_REGION_DEV_INIT(rom_base, CONFIG_ROM_SIZE);
-
-const struct region_device *boot_device_ro(void)
-{
-	return &boot_dev.rdev;
-}
-
-int cbfs_boot_region_properties(struct cbfs_props *props)
-{
-	struct cbfs_header header;
-	int32_t offset;
-	const struct region_device *bdev;
-
-	bdev = boot_device_ro();
-
-	rdev_readat(bdev, &offset, CONFIG_ROM_SIZE - sizeof(offset),
-			sizeof(offset));
-
-	/* The offset is relative to the end of the media. */
-	offset += CONFIG_ROM_SIZE;
-
-	rdev_readat(bdev, &header , offset, sizeof(header));
-
-	header.magic = ntohl(header.magic);
-	header.romsize = ntohl(header.romsize);
-	header.bootblocksize = ntohl(header.bootblocksize);
-	header.align = ntohl(header.align);
-	header.offset = ntohl(header.offset);
-
-	if (header.magic != CBFS_HEADER_MAGIC)
-		return -1;
-
-	props->align = header.align;
-	props->offset = header.offset;
-	if (CONFIG_ROM_SIZE != header.romsize)
-		props->size = CONFIG_ROM_SIZE;
-	else
-		props->size = header.romsize;
-	props->size -= props->offset;
-	props->size -= header.bootblocksize;
-	props->size = ALIGN_DOWN(props->size, props->align);
-
-	printk(BIOS_DEBUG, "CBFS @ %zx size %zx\n", props->offset, props->size);
-
-	return 0;
-}