summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-01-31 07:38:21 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-06 11:14:24 +0100
commit5148642c56eaa66c1680963099e8460aea84dcae (patch)
tree7caa6e0d65a9a415b348e8720b6631baacc97319
parente2227a23a73f2d68cd5d339559813eefc6942837 (diff)
downloadcoreboot-5148642c56eaa66c1680963099e8460aea84dcae.tar.xz
spkmodem: Move under drivers/pc80
Change-Id: I46eb17ab19cea8759b3e4822019285cbe907e83a Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5134 Tested-by: build bot (Jenkins) Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
-rw-r--r--src/drivers/pc80/Makefile.inc5
-rw-r--r--src/drivers/pc80/spkmodem.c (renamed from src/lib/spkmodem.c)0
-rw-r--r--src/lib/Makefile.inc2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc
index 23e986a515..4d0a280b2a 100644
--- a/src/drivers/pc80/Makefile.inc
+++ b/src/drivers/pc80/Makefile.inc
@@ -4,9 +4,12 @@ ramstage-y += i8254.c
ramstage-y += i8259.c
ramstage-$(CONFIG_UDELAY_IO) += udelay_io.c
ramstage-y += keyboard.c
-romstage-$(CONFIG_TPM) += tpm.c
+ramstage-$(CONFIG_SPKMODEM) += spkmodem.c
romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c
+romstage-$(CONFIG_TPM) += tpm.c
+romstage-$(CONFIG_SPKMODEM) += spkmodem.c
+
subdirs-y += vga
cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += cmos.default
diff --git a/src/lib/spkmodem.c b/src/drivers/pc80/spkmodem.c
index 89773b158c..89773b158c 100644
--- a/src/lib/spkmodem.c
+++ b/src/drivers/pc80/spkmodem.c
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index b1b4748960..3bad3fdb6b 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -48,7 +48,6 @@ romstage-$(CONFIG_CACHE_AS_RAM) += ramtest.c
romstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c
romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c
romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
-romstage-$(CONFIG_SPKMODEM) += spkmodem.c
ifeq ($(CONFIG_EARLY_CBMEM_INIT),y)
romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
@@ -91,7 +90,6 @@ romstage-y += clog2.c
ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c
ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
-ramstage-$(CONFIG_SPKMODEM) += spkmodem.c
ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
ramstage-$(CONFIG_TRACE) += trace.c
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c