From 5148642c56eaa66c1680963099e8460aea84dcae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 31 Jan 2014 07:38:21 +0200 Subject: [PATCH] spkmodem: Move under drivers/pc80 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I46eb17ab19cea8759b3e4822019285cbe907e83a Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5134 Tested-by: build bot (Jenkins) Reviewed-by: Vladimir Serbinenko --- src/drivers/pc80/Makefile.inc | 5 ++++- src/{lib => drivers/pc80}/spkmodem.c | 0 src/lib/Makefile.inc | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) rename src/{lib => drivers/pc80}/spkmodem.c (100%) 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 similarity index 100% rename from src/lib/spkmodem.c rename to 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