diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2012-11-30 12:23:45 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-11-30 21:56:33 +0100 |
| commit | 1e753294c4c7bbc825a413ab62c47878104f984f (patch) | |
| tree | b6096874eed22aa72c28f7a3bdf057b16d513e8a | |
| parent | 179206a1acb1659ffe018378494abc269771e9dd (diff) | |
Drop boot directory
It only has two files, move them to src/lib
Change-Id: I17943db4c455aa3a934db1cf56e56e89c009679f
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1959
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | src/boot/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/lib/hardwaremain.c (renamed from src/boot/hardwaremain.c) | 0 | ||||
| -rw-r--r-- | src/lib/selfboot.c (renamed from src/boot/selfboot.c) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc b/Makefile.inc index 7caf359844..927548e0df 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -48,7 +48,7 @@ PHONY+= clean-abuild coreboot lint lint-stable build-dirs ####################################################################### # root source directories of coreboot -subdirs-y := src/lib src/boot src/console src/devices src/ec src/southbridge +subdirs-y := src/lib src/console src/devices src/ec src/southbridge subdirs-y += src/northbridge src/superio src/drivers src/cpu src/vendorcode subdirs-y += util/cbfstool util/sconfig util/nvramtool subdirs-y += src/arch/$(ARCHDIR-y) diff --git a/src/boot/Makefile.inc b/src/boot/Makefile.inc deleted file mode 100644 index a61f89ed00..0000000000 --- a/src/boot/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -ramstage-y += hardwaremain.c -ramstage-y += selfboot.c diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index f99ca1b002..3b161705ed 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -39,6 +39,8 @@ romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-y += compute_ip_checksum.c romstage-y += memmove.c +ramstage-y += hardwaremain.c +ramstage-y += selfboot.c ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y) ramstage-y += memset.c endif diff --git a/src/boot/hardwaremain.c b/src/lib/hardwaremain.c index 206e82b066..206e82b066 100644 --- a/src/boot/hardwaremain.c +++ b/src/lib/hardwaremain.c diff --git a/src/boot/selfboot.c b/src/lib/selfboot.c index 2556a14d6e..2556a14d6e 100644 --- a/src/boot/selfboot.c +++ b/src/lib/selfboot.c |