From 207379db12875b6b94956ef689f12789c805c2b8 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] ne2k: Move under drivers/net MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I978b6009c09c31be4429f57be40ef82f438f7574 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5135 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Ronald G. Minnich --- src/arch/x86/lib/romcc_console.c | 2 +- src/drivers/Makefile.inc | 1 + src/drivers/net/Makefile.inc | 2 ++ src/{lib => drivers/net}/ne2k.c | 0 src/{lib => drivers/net}/ns8390.h | 0 src/lib/Makefile.inc | 3 --- 6 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 src/drivers/net/Makefile.inc rename src/{lib => drivers/net}/ne2k.c (100%) rename src/{lib => drivers/net}/ns8390.h (100%) diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c index 13ee1f004f..db84f9e642 100644 --- a/src/arch/x86/lib/romcc_console.c +++ b/src/arch/x86/lib/romcc_console.c @@ -35,7 +35,7 @@ #include "lib/uart8250.c" #endif #if CONFIG_CONSOLE_NE2K -#include "lib/ne2k.c" +#include "drivers/net/ne2k.c" #endif static void __console_tx_byte(unsigned char byte) diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc index 4b63a8fbe9..eb86a4c060 100644 --- a/src/drivers/Makefile.inc +++ b/src/drivers/Makefile.inc @@ -24,6 +24,7 @@ subdirs-y += generic subdirs-y += i2c subdirs-y += intel subdirs-y += maxim +subdirs-y += net subdirs-y += oxford subdirs-y += parade subdirs-y += realtek diff --git a/src/drivers/net/Makefile.inc b/src/drivers/net/Makefile.inc new file mode 100644 index 0000000000..9b3008dd8b --- /dev/null +++ b/src/drivers/net/Makefile.inc @@ -0,0 +1,2 @@ +romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c +ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c diff --git a/src/lib/ne2k.c b/src/drivers/net/ne2k.c similarity index 100% rename from src/lib/ne2k.c rename to src/drivers/net/ne2k.c diff --git a/src/lib/ns8390.h b/src/drivers/net/ns8390.h similarity index 100% rename from src/lib/ns8390.h rename to src/drivers/net/ns8390.h diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 3bad3fdb6b..79ceebf44b 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -47,7 +47,6 @@ romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c 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 ifeq ($(CONFIG_EARLY_CBMEM_INIT),y) romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c @@ -113,8 +112,6 @@ ramstage-y += cbmem_info.c ramstage-y += hexdump.c romstage-y += hexdump.c -ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c - romstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += ramstage_cache.c ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y)