summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-02-22 06:09:43 +0000
committerStefan Reinauer <stepan@openbios.org>2010-02-22 06:09:43 +0000
commitde3206a7bebce99f11e753164cc4d46357bba96a (patch)
tree9843d883940e372dd357b1357ecd7eaba3e3365f /src/boot
parentd650e9934ff8da9b9cb69e42e642c0ee6d390bf6 (diff)
This is a general cleanup patch
- drop include/part and move files to include/ - get rid lots of warnings - make resource allocator happy with w83627thg - trivial cbmem resume fix - fix payload and log level settings in abuild - fix kontron mptable for virtual wire mode - drop some dead includes and dead code. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5136 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/hardwaremain.c3
-rw-r--r--src/boot/selfboot.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index 071e056892..686b09576f 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -31,8 +31,7 @@ it with the version available from LANL.
#include <device/pci.h>
#include <delay.h>
#include <stdlib.h>
-#include <part/hard_reset.h>
-#include <part/init_timer.h>
+#include <reset.h>
#include <boot/tables.h>
#include <boot/elf.h>
#include <cbfs.h>
diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c
index a26318f97a..09219909a9 100644
--- a/src/boot/selfboot.c
+++ b/src/boot/selfboot.c
@@ -19,7 +19,7 @@
*/
#include <console/console.h>
-#include <part/fallback_boot.h>
+#include <fallback.h>
#include <boot/elf.h>
#include <boot/elf_boot.h>
#include <boot/coreboot_tables.h>