Переглянути джерело

qemu-sparc64: switch to e1000 driver (idea from buildroot), move serial symbols.

Waldemar Brodkorb 9 роки тому
батько
коміт
802123a425

+ 3 - 2
target/linux/config/Config.in.ethernet

@@ -207,8 +207,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_SYSTEM_QEMU_SPARC64
-	default y if ADK_TARGET_SYSTEM_QEMU_SPARC64
+	depends on ADK_TARGET_WITH_PCI
 	default n
 	help
 	  NE2000 PCI driver
@@ -264,6 +263,7 @@ config ADK_KERNEL_E1000
 		ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC || \
 		ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO || \
 		ADK_TARGET_SYSTEM_QEMU_ALPHA || \
+		ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
 		ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_QEMU_X86
@@ -273,6 +273,7 @@ config ADK_KERNEL_E1000
 	default y if ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
 	default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
 	default y if ADK_TARGET_SYSTEM_QEMU_ALPHA
+	default y if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	default y if ADK_TARGET_VBOX
 	default n
 	help

+ 16 - 0
target/linux/config/Config.in.serial

@@ -37,6 +37,12 @@ config ADK_KERNEL_SERIAL_SH_SCI_CONSOLE
 config ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE
 	bool
 
+config ADK_KERNEL_SERIAL_SUNCORE
+	bool
+
+config ADK_KERNEL_SERIAL_SUNSU_CONSOLE
+	bool
+
 config ADK_KERNEL_DA_CONSOLE
 	bool
 
@@ -84,6 +90,16 @@ config ADK_KERNEL_DA_TTY
 	help
 	  Serial driver for Qemu METAG Emulation.
 
+config ADK_KERNEL_SERIAL_SUNSU
+	bool "Sun Sparc64 serial driver"
+	select ADK_KERNEL_SERIAL_SUNSU_CONSOLE
+	select ADK_KERNEL_SERIAL_SUNCORE
+	depends on ADK_TARGET_SYSTEM_QEMU_SPARC64
+	default y if ADK_TARGET_SYSTEM_QEMU_SPARC64
+	default n
+	help
+	  Serial driver for Sun SPARC64.
+
 config ADK_KERNEL_SERIAL_ETRAXFS
 	bool "ETRAXFS serial driver"
 	select ADK_KERNEL_SERIAL_ETRAXFS_CONSOLE

+ 2 - 0
target/sparc64/Makefile

@@ -14,6 +14,8 @@ QEMU_ARGS+=-net nic,model=virtio -net user
 ifeq ($(ADK_TARGET_FS),archive)
 QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio
 endif
+else
+QEMU_ARGS+=-net nic,model=e1000 -net user
 endif
 
 # target helper text

+ 1 - 5
target/sparc64/kernel/qemu-sparc64

@@ -6,9 +6,5 @@ CONFIG_OF=y
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
-CONFIG_IOMMU_SUPPORT=y
 CONFIG_OF_IOMMU=y
-CONFIG_SERIAL_CONSOLE=y
-CONFIG_SERIAL_SUNCORE=y
-CONFIG_SERIAL_SUNSU=y
-CONFIG_SERIAL_SUNSU_CONSOLE=y
+CONFIG_IOMMU_SUPPORT=y