diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-24 20:30:53 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-24 20:31:41 +0200 |
| commit | 56b4873f0feba3013f8ffc5ae119165322c3e33d (patch) | |
| tree | 1b7504df1bd8602e01e0cb5ff5a6507f56a03829 | |
| parent | 1db49cba2eb4b1a17bc03680d97b6f217011cf53 (diff) | |
use e1000 for qemu-ppc, fix libstdcxx compile
| -rw-r--r-- | target/config/Config.in.target | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.ethernet | 5 | ||||
| -rw-r--r-- | target/ppc/Makefile | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 5d87af765..62fb897ea 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -5,6 +5,8 @@ config ADK_TARGET_CFLAGS string default "-m4 -ml" if ADK_CPU_SH4 && ADK_little default "-m4 -mb" if ADK_CPU_SH4 && ADK_big + default "-mcpu=powerpc" if ADK_CPU_PPC + default "-mcpu=powerpc64" if ADK_CPU_PPC64 default "-march=geode" if ADK_CPU_GEODE default "-march=i486" if ADK_CPU_I486 default "-march=i586" if ADK_CPU_I586 diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 36600fe87..642049056 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -142,8 +142,7 @@ config ADK_KERNEL_NE2K_PCI select ADK_KERNEL_NET_VENDOR_NATSEMI select ADK_KERNEL_NET_VENDOR_8390 select ADK_KERNEL_MII - depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU - default y if ADK_TARGET_SYSTEM_QEMU_PPC + depends on ADK_TARGET_WITH_PCI default n help NE2000 PCI driver @@ -166,7 +165,6 @@ config ADK_KERNEL_8139CP select ADK_KERNEL_MII depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU default y if ADK_TARGET_SYSTEM_QEMU_SH4 - default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n help RTL8139C+ pci driver @@ -204,6 +202,7 @@ config ADK_KERNEL_E1000 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_QEMU_MIPS default y if ADK_TARGET_SYSTEM_QEMU_MIPS64 + default y if ADK_TARGET_SYSTEM_QEMU_PPC default n help Intel(R) PRO/1000 gigabit ethernet driver diff --git a/target/ppc/Makefile b/target/ppc/Makefile index 4966e322e..b3845672f 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -12,6 +12,7 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build QEMU_ARGS:=-M mac99 QEMU_ARGS+=${ADK_QEMU_ARGS} +QEMU_ARGS+=-device e1000,netdev=adk0 -netdev user,id=adk0 # target helper text ifeq ($(ADK_TARGET_FS),archive) |