浏览代码

use e1000 for qemu-ppc, fix libstdcxx compile

Waldemar Brodkorb 11 年之前
父节点
当前提交
56b4873f0f
共有 3 个文件被更改,包括 5 次插入3 次删除
  1. 2 0
      target/config/Config.in.target
  2. 2 3
      target/linux/config/Config.in.ethernet
  3. 1 0
      target/ppc/Makefile

+ 2 - 0
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

+ 2 - 3
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

+ 1 - 0
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)