diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 21:46:48 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 21:46:48 +0100 |
| commit | c7f2f4bba73e53d9b5d1926b220205884bd26d4a (patch) | |
| tree | 580ad737ecb84894aa3bd38ea355c6ee2d02ed9d | |
| parent | 2e532239605af2a65a0dee58a6bb0578487a1c9a (diff) | |
fix merge problem, enable e1000 driver correctly
| -rw-r--r-- | target/Config.in | 2 | ||||
| -rw-r--r-- | toolchain/Makefile | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/target/Config.in b/target/Config.in index 9e4842b96..5a2c95df3 100644 --- a/target/Config.in +++ b/target/Config.in @@ -543,6 +543,7 @@ config ADK_LINUX_CRIS_QEMU config ADK_LINUX_X86_QEMU bool "x86" select ADK_x86_qemu + select ADK_KERNEL_NETDEV_1000 select ADK_KPACKAGE_KMOD_E1000 select ADK_KERNEL_INPUT_KEYBOARD select ADK_KERNEL_SCSI @@ -557,6 +558,7 @@ config ADK_LINUX_X86_QEMU config ADK_LINUX_X86_64_QEMU bool "x86_64" select ADK_x86_64_qemu + select ADK_KERNEL_NETDEV_1000 select ADK_KPACKAGE_KMOD_E1000 select ADK_KERNEL_INPUT_KEYBOARD select ADK_KERNEL_SCSI diff --git a/toolchain/Makefile b/toolchain/Makefile index fe16fc6af..d2f59f8ba 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -38,15 +38,11 @@ clean: $(TARGETS_CLEAN) download: $(DOWNLOAD) gcc-prepare: binutils-install gmp-install mpfr-install -<<<<<<< HEAD ifeq ($(ADK_TARGET_LIB_GLIBC),y) $(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare else $(LIBC)-prepare: gcc-prepare kernel-headers-prepare endif -======= -$(LIBC)-prepare: gcc-prepare kernel-headers-prepare ->>>>>>> 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 gcc-configure: $(LIBC)-prepare $(LIBC)-compile: gcc-configure gcc-compile: $(LIBC)-install |